From 880640f1a19d54a7336552cc5dcfaff12381e500 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 13 Mar 2024 10:04:05 -0400
Subject: [PATCH 01/32] Deprecate component template resolution

RFC: https://github.com/emberjs/rfcs/pull/995
---
 .../@ember/-internals/glimmer/lib/resolver.ts   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 26530594b4c..4d71f9d43c9 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,6 +1,6 @@
 import type { InternalFactory, InternalOwner, RegisterOptions } from '@ember/-internals/owner';
 import { isFactory } from '@ember/-internals/owner';
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
 import type {
@@ -65,6 +65,21 @@ function layoutFor(
 ): Nullable<Template> {
   let templateFullName = `template:components/${name}` as const;
 
+  deprecate(
+    `Components with separetly resolved templates are deprecated. Migrate to either co-located js/ts + hbs files or to gjs/gts.`,
+    false,
+    {
+      id: 'component-template-resolving',
+      url: 'https://deprecations.emberjs.com/id/component-template-resolving',
+      until: '6.0.0',
+      for: 'ember-source',
+      since: {
+        available: '5.10.0',
+        enabled: '5.10.0',
+      },
+    }
+  );
+
   return (owner.lookup(templateFullName, options) as Template) || null;
 }
 

From 2ab758fb0060ff25e41783ae537fe6c46c4a01b0 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Tue, 2 Apr 2024 18:17:58 -0400
Subject: [PATCH 02/32] Re-work how components are built in the internal test
 helpers

---
 .../@ember/-internals/deprecations/index.ts   |  9 +++++
 .../@ember/-internals/glimmer/lib/resolver.ts | 17 ++-------
 .../application/debug-render-tree-test.ts     | 11 +++++-
 .../lib/test-cases/rendering.ts               | 37 ++++++++++++++++---
 4 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/packages/@ember/-internals/deprecations/index.ts b/packages/@ember/-internals/deprecations/index.ts
index 041b533468d..14dc41b3ce4 100644
--- a/packages/@ember/-internals/deprecations/index.ts
+++ b/packages/@ember/-internals/deprecations/index.ts
@@ -106,6 +106,15 @@ export const DEPRECATIONS = {
       available: '5.9.0',
     },
   }),
+  DEPRECATE_COMPONENT_TEMPLATE_RESOLVING: deprecation({
+    id: 'component-template-resolving',
+    url: 'https://deprecations.emberjs.com/id/component-template-resolving',
+    until: '6.0.0',
+    for: 'ember-source',
+    since: {
+      available: '5.9.0',
+    },
+  }),
 };
 
 export function deprecateUntil(message: string, deprecation: DeprecationObject) {
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 4d71f9d43c9..b9e40081979 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -45,6 +45,7 @@ import { default as uniqueId } from './helpers/unique-id';
 import actionModifier from './modifiers/action';
 import { mountHelper } from './syntax/mount';
 import { outletHelper } from './syntax/outlet';
+import { DEPRECATIONS, deprecateUntil } from '@ember/-internals/deprecations';
 
 function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
@@ -65,19 +66,9 @@ function layoutFor(
 ): Nullable<Template> {
   let templateFullName = `template:components/${name}` as const;
 
-  deprecate(
-    `Components with separetly resolved templates are deprecated. Migrate to either co-located js/ts + hbs files or to gjs/gts.`,
-    false,
-    {
-      id: 'component-template-resolving',
-      url: 'https://deprecations.emberjs.com/id/component-template-resolving',
-      until: '6.0.0',
-      for: 'ember-source',
-      since: {
-        available: '5.10.0',
-        enabled: '5.10.0',
-      },
-    }
+  deprecateUntil(
+    `Components with separately resolved templates are deprecated. Migrate to either co-located js/ts + hbs files or to gjs/gts.`,
+    DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING
   );
 
   return (owner.lookup(templateFullName, options) as Template) || 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 8be91a4e555..b3d96ac0def 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,8 +1,10 @@
 import {
   ApplicationTestCase,
   ModuleBasedTestResolver,
+  expectDeprecation,
   moduleFor,
   strip,
+  testUnless,
 } from 'internal-test-helpers';
 
 import { ENV } from '@ember/-internals/environment';
@@ -22,6 +24,7 @@ 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';
+import { DEPRECATIONS } from '@ember/-internals/deprecations';
 
 interface CapturedBounds {
   parentElement: SimpleElement;
@@ -775,7 +778,13 @@ if (ENV._DEBUG_RENDER_TREE) {
         ]);
       }
 
-      async '@test template-only components'() {
+      async [`${testUnless(
+        DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved
+      )} template-only components`]() {
+        expectDeprecation(
+          /resolved templates/,
+          DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isEnabled
+        );
         this.addTemplate(
           'application',
           strip`
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts
index e2b4ef86039..24263e5ca5c 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.ts
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts
@@ -2,7 +2,7 @@ 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 from '@ember/component';
+import Component, { setComponentTemplate } from '@ember/component';
 import { helper, Helper, _resetRenderers } from '@ember/-internals/glimmer';
 import type Resolver from '../test-resolver';
 import { ModuleBasedResolver } from '../test-resolver';
@@ -13,6 +13,7 @@ import { runAppend, runDestroy, runTask } from '../run';
 import type { InternalFactory } from '@ember/-internals/owner';
 import type { BootOptions, EngineInstanceOptions } from '@ember/engine/instance';
 import type EngineInstance from '@ember/engine/instance';
+import templateOnly from '@ember/component/template-only';
 
 const TextNode = window.Text;
 
@@ -101,15 +102,25 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     }
   }
 
-  addComponent(name: string, { ComponentClass = null, template = null }) {
+  addComponent(
+    name: string,
+    { ComponentClass = null, template = null, resolveableTemplate = null }
+  ) {
     if (ComponentClass) {
       this.resolver.add(`component:${name}`, ComponentClass);
     }
 
     if (typeof template === 'string') {
+      setComponentTemplate(
+        this.compile(template, { moduleName: name }),
+        ComponentClass || templateOnly()
+      );
+    }
+
+    if (typeof resolveableTemplate === 'string') {
       this.resolver.add(
         `template:components/${name}`,
-        this.compile(template, {
+        this.compile(resolveableTemplate, {
           moduleName: `components/${name}`,
         })
       );
@@ -176,7 +187,10 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     this.owner.register(`helper:${name}`, definition);
   }
 
-  registerComponent(name: string, { ComponentClass = Component, template = null }) {
+  registerComponent(
+    name: string,
+    { ComponentClass = Component, template = null, resolveableTemplate = null }
+  ) {
     let { owner } = this;
 
     if (ComponentClass) {
@@ -184,9 +198,22 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     }
 
     if (typeof template === 'string') {
+      let compiled = this.compile(template, { moduleName: name });
+      // class types are hard
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      let stateContainer: any = ComponentClass;
+
+      if (stateContainer === Component) {
+        stateContainer = class extends Component {};
+      }
+
+      setComponentTemplate(compiled, stateContainer);
+    }
+
+    if (typeof resolveableTemplate === 'string') {
       owner.register(
         `template:components/${name}`,
-        this.compile(template, {
+        this.compile(resolveableTemplate, {
           moduleName: `my-app/templates/components/${name}.hbs`,
         })
       );

From d75d40bea1ae9c92e4554c121dfdb9214e67afe6 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Apr 2024 17:10:11 -0400
Subject: [PATCH 03/32] Down to 52 failing tests

---
 .../lib/test-cases/rendering.ts               | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts
index 24263e5ca5c..ac3471a66b9 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.ts
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts
@@ -107,14 +107,20 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     { ComponentClass = null, template = null, resolveableTemplate = null }
   ) {
     if (ComponentClass) {
-      this.resolver.add(`component:${name}`, ComponentClass);
+      let localClass = ComponentClass as typeof Component;
+
+      this.resolver.add(`component:${name}`, localClass);
+
+      if (typeof template === 'string') {
+        setComponentTemplate(this.compile(template), ComponentClass ? localClass : templateOnly());
+      }
+
+      return;
     }
 
     if (typeof template === 'string') {
-      setComponentTemplate(
-        this.compile(template, { moduleName: name }),
-        ComponentClass || templateOnly()
-      );
+      let toComponent = setComponentTemplate(this.compile(template), templateOnly());
+      this.resolver.add(`component:${name}`, toComponent);
     }
 
     if (typeof resolveableTemplate === 'string') {
@@ -194,20 +200,15 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     let { owner } = this;
 
     if (ComponentClass) {
-      owner.register(`component:${name}`, ComponentClass);
-    }
+      let stateContainer = class extends ComponentClass {};
 
-    if (typeof template === 'string') {
-      let compiled = this.compile(template, { moduleName: name });
-      // class types are hard
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      let stateContainer: any = ComponentClass;
+      owner.register(`component:${name}`, stateContainer);
 
-      if (stateContainer === Component) {
-        stateContainer = class extends Component {};
-      }
+      if (typeof template === 'string') {
+        let compiled = this.compile(template);
 
-      setComponentTemplate(compiled, stateContainer);
+        setComponentTemplate(compiled, stateContainer);
+      }
     }
 
     if (typeof resolveableTemplate === 'string') {

From 9bb9c1cb0cbe16d602480c378d310b3616591dc3 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Apr 2024 17:16:43 -0400
Subject: [PATCH 04/32] 40 left

---
 .../internal-test-helpers/lib/test-cases/rendering.ts    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts
index ac3471a66b9..4295e43ad63 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.ts
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts
@@ -205,12 +205,15 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
       owner.register(`component:${name}`, stateContainer);
 
       if (typeof template === 'string') {
-        let compiled = this.compile(template);
-
-        setComponentTemplate(compiled, stateContainer);
+        setComponentTemplate(this.compile(template), stateContainer);
       }
     }
 
+    if (typeof template === 'string') {
+      let toComponent = setComponentTemplate(this.compile(template), templateOnly());
+      this.resolver.add(`component:${name}`, toComponent);
+    }
+
     if (typeof resolveableTemplate === 'string') {
       owner.register(
         `template:components/${name}`,

From 85255bcb2e24596318e66b23381c88cd99adbca3 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Apr 2024 17:37:05 -0400
Subject: [PATCH 05/32] Add checkbox to enable deprecations

---
 tests/index.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/index.html b/tests/index.html
index 326dd8318bb..906c66f2e1e 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -103,6 +103,13 @@
 
         QUnit.config.urlConfig.push('forceskip');
 
+        QUnit.config.urlConfig.push({
+          id: 'overridedeprecationversion',
+          value: '20.0.0',
+          label: 'Enable all deprecations',
+        });
+
+
         if (QUnit.config.seed) {
           QUnit.config.reorder = false;
         }

From 4ac533276aa1240238ad5082021685d489970ce8 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Apr 2024 17:45:04 -0400
Subject: [PATCH 06/32] 728 failing tests with the deprecations turned on

---
 .../components/component-template-test.js       | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 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 cc9ae573d96..d43ff551fbb 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,15 @@
 import { DEBUG } from '@glimmer/env';
-import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
+import {
+  expectDeprecation,
+  moduleFor,
+  RenderingTestCase,
+  runTask,
+  testUnless,
+} from 'internal-test-helpers';
 
 import { setComponentTemplate, getComponentTemplate } from '@glimmer/manager';
 import { Component, compile } from '../../utils/helpers';
+import { DEPRECATIONS } from '../../../../deprecations';
 
 moduleFor(
   'Components test: setComponentTemplate',
@@ -21,10 +28,14 @@ moduleFor(
       this.assertComponentElement(this.firstChild, { content: 'hello' });
     }
 
-    '@test it takes precedence over resolver'() {
+    [`${testUnless(
+      DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved
+    )} it takes precedence over resolver`]() {
+      expectDeprecation('', DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isEnabled);
+
       this.registerComponent('foo-bar', {
         ComponentClass: setComponentTemplate(compile('hello'), Component.extend()),
-        template: 'noooooo!',
+        resolveableTemplate: 'noooooo!',
       });
 
       this.render('<FooBar />');

From 831440214cbdf00929bfc956389ed4f5692110fa Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Apr 2024 18:12:52 -0400
Subject: [PATCH 07/32] Down to 13

---
 .../integration/components/curly-components-test.js    |  6 +++---
 .../tests/integration/custom-component-manager-test.js |  7 ++++---
 .../glimmer/tests/unit/runtime-resolver-cache-test.js  | 10 ++++++++--
 .../internal-test-helpers/lib/test-cases/rendering.ts  | 10 +++++++---
 tests/index.html                                       |  4 ++--
 5 files changed, 24 insertions(+), 13 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 63ade99e232..afa67145fd3 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
@@ -1267,7 +1267,7 @@ moduleFor(
         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) ");
+      }, 'Using {{attrs}} to reference named arguments is not supported. {{attrs.someProp}} should be updated to {{@someProp}}. (L1:C24) ');
     }
 
     // Perhaps change this test to `{{this.attrs.someProp.value}}` when removing the deprecation?
@@ -1579,7 +1579,7 @@ moduleFor(
         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) ");
+      }, 'Using {{attrs}} to reference named arguments is not supported. {{attrs.someProp}} should be updated to {{@someProp}}. (L1:C24) ');
     }
 
     // Perhaps change this test to `{{this.attrs.someProp.value}}` when removing the deprecation?
@@ -3325,7 +3325,7 @@ moduleFor(
           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) ");
+      }, 'Using {{attrs}} to reference named arguments is not supported. {{attrs.myVar}} should be updated to {{@myVar}}. (L1:C10) ');
     }
 
     // Perhaps change this test to `{{this.attrs.myVar.value}}` when removing the deprecation?
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 4c42d0f6616..6dfcc65284a 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
@@ -117,7 +117,8 @@ moduleFor(
     }
 
     ['@test it can have no template context']() {
-      let ComponentClass = setComponentManager(() => {
+      class ComponentWithNoTemplate {}
+      setComponentManager(() => {
         return EmberObject.create({
           capabilities: componentCapabilities('3.13'),
 
@@ -131,11 +132,11 @@ moduleFor(
             return null;
           },
         });
-      }, {});
+      }, ComponentWithNoTemplate);
 
       this.registerComponent('foo-bar', {
         template: `<p>{{@greeting}} world</p>`,
-        ComponentClass,
+        ComponentClass: ComponentWithNoTemplate,
       });
 
       this.render('{{foo-bar greeting="hello"}}');
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 60b0ae934a8..5321c033eae 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
@@ -5,11 +5,14 @@ import {
   runDestroy,
   runAppend,
   runTask,
+  testUnless,
+  expectDeprecation,
 } from 'internal-test-helpers';
 
 import { set } from '@ember/object';
 import { templateCacheCounters } from '@ember/-internals/glimmer';
 import { Component } from '../utils/helpers';
+import { DEPRECATIONS } from '../../../deprecations';
 
 moduleFor(
   'ember-glimmer runtime resolver cache',
@@ -122,9 +125,12 @@ moduleFor(
       this.expectCacheChanges({}, 'toggle back to component-two no change');
     }
 
-    ['@test each template is only compiled once']() {
+    [`${testUnless(
+      DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved
+    )} each template is only compiled once`]() {
+      expectDeprecation(/msg here/, DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isEnabled);
       // static layout
-      this.registerComponent('component-one', { template: 'One' });
+      this.registerComponent('component-one', { resolveableTemplate: 'One' });
 
       // test directly import template factory onto late bound layout
       let Two = Component.extend({
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts
index 4295e43ad63..27de1e8f693 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.ts
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts
@@ -200,12 +200,16 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     let { owner } = this;
 
     if (ComponentClass) {
-      let stateContainer = class extends ComponentClass {};
+      // We cannot set templates multiple times on a class
+      if (ComponentClass === Component) {
+        // @ts-expect-error - class/instance types in TS are hard
+        ComponentClass = class extends Component {};
+      }
 
-      owner.register(`component:${name}`, stateContainer);
+      owner.register(`component:${name}`, ComponentClass);
 
       if (typeof template === 'string') {
-        setComponentTemplate(this.compile(template), stateContainer);
+        setComponentTemplate(this.compile(template), ComponentClass);
       }
     }
 
diff --git a/tests/index.html b/tests/index.html
index 906c66f2e1e..f2bb0998b63 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -105,8 +105,8 @@
 
         QUnit.config.urlConfig.push({
           id: 'overridedeprecationversion',
-          value: '20.0.0',
-          label: 'Enable all deprecations',
+          value: ['20.0.0', '6.0.0', '5.12.0'],
+          label: 'Deprecation Version',
         });
 
 

From c7508cc64fdd416962aa47cb963ed36d033eb8cf Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Apr 2024 18:22:06 -0400
Subject: [PATCH 08/32] Base tests pass again after test harness updates

---
 .../glimmer/lib/component-managers/curly.ts      |  7 +++++++
 .../tests/integration/components/append-test.js  | 16 ++++++++--------
 .../components/template-only-components-test.js  |  2 +-
 3 files changed, 16 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 23d004c28f5..60c76a13084 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -51,6 +51,7 @@ import {
 
 import ComponentStateBucket from '../utils/curly-component-state-bucket';
 import { processComponentArgs } from '../utils/process-args';
+import { getComponentTemplate } from '@ember/component';
 
 export const ARGS = enumerableSymbol('ARGS');
 export const HAS_BLOCK = enumerableSymbol('HAS_BLOCK');
@@ -133,6 +134,12 @@ export default class CurlyComponentManager
     let factory: TemplateFactory;
 
     if (layout === undefined) {
+      let theSetTemplate = getComponentTemplate(component);
+
+      if (theSetTemplate) {
+        return unwrapTemplate(theSetTemplate(owner)).asWrappedLayout();
+      }
+
       if (layoutName !== undefined) {
         let _factory = owner.lookup(`template:${layoutName}`) as TemplateFactory;
         assert(`Layout \`${layoutName}\` not found!`, _factory !== undefined);
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 ae7cbd22079..98eb9e9b47b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
@@ -110,7 +110,7 @@ class AbstractAppendTest extends RenderingTestCase {
             this._super(...arguments);
           },
         }),
-        template: _options.template,
+        resolveableTemplate: _options.resolveableTemplate,
       };
 
       oldRegisterComponent.call(this, name, options);
@@ -121,7 +121,7 @@ class AbstractAppendTest extends RenderingTestCase {
         layoutName: 'components/x-parent',
       }),
 
-      template:
+      resolveableTemplate:
         '[parent: {{this.foo}}]{{#x-child bar=this.foo}}[yielded: {{this.foo}}]{{/x-child}}',
     });
 
@@ -130,7 +130,7 @@ class AbstractAppendTest extends RenderingTestCase {
         tagName: '',
       }),
 
-      template: '[child: {{this.bar}}]{{yield}}',
+      resolveableTemplate: '[child: {{this.bar}}]{{yield}}',
     });
 
     let XParent;
@@ -294,7 +294,7 @@ class AbstractAppendTest extends RenderingTestCase {
         },
       }),
 
-      template:
+      resolveableTemplate:
         '[parent: {{this.foo}}]{{#x-child bar=this.foo}}[yielded: {{this.foo}}]{{/x-child}}',
     });
 
@@ -303,7 +303,7 @@ class AbstractAppendTest extends RenderingTestCase {
         tagName: '',
       }),
 
-      template: '[child: {{this.bar}}]{{yield}}',
+      resolveableTemplate: '[child: {{this.bar}}]{{yield}}',
     });
 
     let XParent;
@@ -401,7 +401,7 @@ class AbstractAppendTest extends RenderingTestCase {
         },
       }),
 
-      template: 'x-first {{this.foo}}!',
+      resolveableTemplate: 'x-first {{this.foo}}!',
     });
 
     this.registerComponent('x-second', {
@@ -413,7 +413,7 @@ class AbstractAppendTest extends RenderingTestCase {
         },
       }),
 
-      template: 'x-second {{this.bar}}!',
+      resolveableTemplate: 'x-second {{this.bar}}!',
     });
 
     let First, Second;
@@ -704,7 +704,7 @@ moduleFor(
         ComponentClass: Component.extend({
           layoutName: 'components/foo-bar',
         }),
-        template: 'FOO BAR!',
+        resolveableTemplate: 'FOO BAR!',
       });
 
       let FooBar = this.owner.factoryFor('component:foo-bar');
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 e555f5a511a..50780d86b77 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
@@ -191,7 +191,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass,
-        template: 'this should not be rendered',
+        resolveableTemplate: 'this should not be rendered',
       });
 
       this.render('{{foo-bar}}');

From f0b3ec3ec0d838671f3292ebed8b55df4e12e3ba Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Apr 2024 18:33:19 -0400
Subject: [PATCH 09/32] Update the test-resolver-application

---
 .../lib/test-cases/abstract-application.ts    |  2 +-
 .../test-cases/test-resolver-application.ts   | 29 +++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

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 05acec12a80..b6b89d87fbd 100644
--- a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
@@ -79,7 +79,7 @@ export default abstract class AbstractApplicationTestCase extends AbstractTestCa
     return this.application.resolveRegistration('router:main') as typeof Router;
   }
 
-  compile(templateString: string, options: Partial<EmberPrecompileOptions> = {}): object {
+  compile(templateString: string, options: Partial<EmberPrecompileOptions> = {}) {
     return compile(templateString, options);
   }
 }
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 e292fecc4ef..e61118b225d 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,8 +1,9 @@
 import AbstractApplicationTestCase from './abstract-application';
 import type Resolver from '../test-resolver';
 import { ModuleBasedResolver } from '../test-resolver';
-import Component from '@ember/component';
+import Component, { setComponentTemplate } from '@ember/component';
 import type { InternalFactory } from '@ember/-internals/owner';
+import templateOnly from '@ember/component/template-only';
 
 export default abstract class TestResolverApplicationTestCase extends AbstractApplicationTestCase {
   abstract resolver?: Resolver;
@@ -31,16 +32,38 @@ export default abstract class TestResolverApplicationTestCase extends AbstractAp
     {
       ComponentClass = Component,
       template = null,
-    }: { ComponentClass?: object | null; template?: string | null }
+      resolveableTemplate = null,
+    }: {
+      ComponentClass?: object | null;
+      template?: string | null;
+      resolveableTemplate?: string | null;
+    }
   ) {
     if (ComponentClass) {
+      // We cannot set templates multiple times on a class
+      if (ComponentClass === Component) {
+        ComponentClass = class extends Component {};
+      }
+
       this.resolver!.add(`component:${name}`, ComponentClass);
+
+      if (typeof template === 'string') {
+        setComponentTemplate(this.compile(template, {}), ComponentClass);
+      }
+
+      return;
     }
 
     if (typeof template === 'string') {
+      let toComponent = setComponentTemplate(this.compile(template, {}), templateOnly());
+
+      this.resolver!.add(`component:${name}`, toComponent);
+    }
+
+    if (typeof resolveableTemplate === 'string') {
       this.resolver!.add(
         `template:components/${name}`,
-        this.compile(template, {
+        this.compile(resolveableTemplate, {
           moduleName: `my-app/templates/components/${name}.hbs`,
         })
       );

From 53f346a9d3447eec15a1f494f3b54646d1e5f0a5 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Apr 2024 18:36:54 -0400
Subject: [PATCH 10/32] Add attempted lookup in error message

---
 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 b9e40081979..5dd10061442 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -67,7 +67,7 @@ function layoutFor(
   let templateFullName = `template:components/${name}` as const;
 
   deprecateUntil(
-    `Components with separately resolved templates are deprecated. Migrate to either co-located js/ts + hbs files or to gjs/gts.`,
+    `Components with separately resolved templates are deprecated. Migrate to either co-located js/ts + hbs files or to gjs/gts. Tried to lookup '${templateFullName}'.`,
     DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING
   );
 

From 2a9722ec7f706ea654958f466071d1c872e9d652 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Apr 2024 18:45:57 -0400
Subject: [PATCH 11/32] Wip try to fix debug render tree tests

---
 .../application/debug-render-tree-test.ts     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 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 b3d96ac0def..67aedea85e7 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
@@ -25,6 +25,7 @@ import type { EmberPrecompileOptions } from 'ember-template-compiler';
 import { compile } from 'ember-template-compiler';
 import { runTask } from 'internal-test-helpers/lib/run';
 import { DEPRECATIONS } from '@ember/-internals/deprecations';
+import templateOnly from '@ember/component/template-only';
 
 interface CapturedBounds {
   parentElement: SimpleElement;
@@ -207,10 +208,13 @@ if (ENV._DEBUG_RENDER_TREE) {
                 )
               );
               this.register(
-                'template:components/inspect-model',
-                compileTemplate('{{@model}}', {
-                  moduleName: 'foo/components/inspect-model.hbs',
-                })
+                'component:components/inspect-model',
+                setComponentTemplate(
+                  compileTemplate('{{@model}}', {
+                    moduleName: 'foo/components/inspect-model.hbs',
+                  }),
+                  templateOnly()
+                )
               );
             }
 
@@ -245,10 +249,13 @@ if (ENV._DEBUG_RENDER_TREE) {
                 )
               );
               this.register(
-                'template:components/inspect-model',
-                compileTemplate('{{@model}}', {
-                  moduleName: 'bar/components/inspect-model.hbs',
-                })
+                'component:components/inspect-model',
+                setComponentTemplate(
+                  compileTemplate('{{@model}}', {
+                    moduleName: 'bar/components/inspect-model.hbs',
+                  }),
+                  templateOnly()
+                )
               );
             }
 

From 945327924e3d0d8bb6702c4490773c5f7221eebe Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 8 Apr 2024 13:09:56 -0400
Subject: [PATCH 12/32] Update lookupComponent and lookupComponentPair to not
 try to resolve templates once the deprecation is in the removed state

---
 .../@ember/-internals/glimmer/lib/resolver.ts | 10 ++++--
 .../application/debug-render-tree-test.ts     | 33 ++++++++++---------
 .../integration/application/engine-test.js    | 16 ++++-----
 .../test-cases/test-resolver-application.ts   |  4 +++
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 5dd10061442..a5285c455ff 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -45,7 +45,7 @@ import { default as uniqueId } from './helpers/unique-id';
 import actionModifier from './modifiers/action';
 import { mountHelper } from './syntax/mount';
 import { outletHelper } from './syntax/outlet';
-import { DEPRECATIONS, deprecateUntil } from '@ember/-internals/deprecations';
+import { DEPRECATIONS, deprecateUntil, isRemoved } from '@ember/-internals/deprecations';
 
 function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
@@ -103,6 +103,10 @@ function lookupComponentPair(
     }
   }
 
+  if (isRemoved(DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.options)) {
+    return { component, layout: null } as LookupResult;
+  }
+
   let layout = layoutFor(name, owner, options);
 
   if (component === null && layout === null) {
@@ -259,7 +263,9 @@ export default class ResolverImpl
     let key: object;
 
     if (pair.component === null) {
-      key = template = pair.layout(owner);
+      if (!isRemoved(DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.options)) {
+        key = template = pair.layout(owner);
+      }
     } else {
       key = pair.component;
     }
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 67aedea85e7..2b260f2ecf0 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
@@ -208,7 +208,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 )
               );
               this.register(
-                'component:components/inspect-model',
+                'component:inspect-model',
                 setComponentTemplate(
                   compileTemplate('{{@model}}', {
                     moduleName: 'foo/components/inspect-model.hbs',
@@ -249,7 +249,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 )
               );
               this.register(
-                'component:components/inspect-model',
+                'component:inspect-model',
                 setComponentTemplate(
                   compileTemplate('{{@model}}', {
                     moduleName: 'bar/components/inspect-model.hbs',
@@ -618,10 +618,13 @@ if (ENV._DEBUG_RENDER_TREE) {
                 })
               );
               this.register(
-                'template:components/hello',
-                compileTemplate('<span>Hello {{@message}}</span>', {
-                  moduleName: 'foo/components/hello.hbs',
-                })
+                'component:hello',
+                setComponentTemplate(
+                  compileTemplate('<span>Hello {{@message}}</span>', {
+                    moduleName: 'foo/components/hello.hbs',
+                  }),
+                  templateOnlyComponent()
+                )
               );
             }
 
@@ -952,7 +955,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         this.addComponent('hello-world', {
           ComponentClass: setComponentTemplate(
             compileTemplate('{{@name}}', { moduleName: 'my-app/components/hello-world.hbs' }),
-            templateOnlyComponent()
+            templateOnlyComponent('my-app/components/hello-world', 'HelloWorld')
           ),
         });
 
@@ -1037,7 +1040,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: Record<string, string>) => instance['name'] === 'first',
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
@@ -1053,7 +1056,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: Record<string, string>) => instance['name'] === 'first',
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
@@ -1062,7 +1065,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'second' } },
             instance: (instance: Record<string, string>) => instance['name'] === 'second',
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
@@ -1078,7 +1081,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: Record<string, string>) => instance['name'] === 'first',
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
@@ -1122,7 +1125,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: Record<string, string>) => instance['name'] === 'first',
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
@@ -1138,7 +1141,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: Record<string, string>) => instance['name'] === 'first',
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
@@ -1147,7 +1150,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'second' } },
             instance: (instance: Record<string, string>) => instance['name'] === 'second',
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
@@ -1163,7 +1166,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: Record<string, string>) => instance['name'] === 'first',
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
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 247c9c27674..50ba88c7917 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -4,6 +4,7 @@ import {
   ModuleBasedTestResolver,
   strip,
   runTaskNext,
+  expectDeprecation,
 } from 'internal-test-helpers';
 
 import { Component } from '@ember/-internals/glimmer';
@@ -14,6 +15,9 @@ import Engine from '@ember/engine';
 import { next } from '@ember/runloop';
 
 import { compile } from '../../utils/helpers';
+import { setComponentTemplate } from '@glimmer/manager';
+import { templateOnlyComponent } from '@glimmer/runtime';
+import { DEPRECATIONS } from '../../../../deprecations';
 
 moduleFor(
   'Application test: engine rendering',
@@ -217,10 +221,8 @@ moduleFor(
             );
             this.register('template:application', sharedTemplate);
             this.register(
-              'template:components/ambiguous-curlies',
-              compile(strip`
-        <p>Component!</p>
-      `)
+              'component:ambiguous-curlies',
+              setComponentTemplate(compile(`<p>Component!</p>`), templateOnlyComponent())
             );
           },
         })
@@ -275,10 +277,8 @@ moduleFor(
             );
             this.register('component:my-component', sharedComponent);
             this.register(
-              'template:components/ambiguous-curlies',
-              compile(strip`
-                <p>Component!</p>
-              `)
+              'component:ambiguous-curlies',
+              setComponentTemplate(compile(`<p>Component!</p>`), templateOnlyComponent())
             );
           },
         })
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 e61118b225d..4597004e6db 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
@@ -48,6 +48,8 @@ export default abstract class TestResolverApplicationTestCase extends AbstractAp
       this.resolver!.add(`component:${name}`, ComponentClass);
 
       if (typeof template === 'string') {
+        // moduleName not passed to this.compile, because *it's just wrong*.
+        // moduleName represents a path-on-disk, and we can't guarantee we have that mapping.
         setComponentTemplate(this.compile(template, {}), ComponentClass);
       }
 
@@ -55,6 +57,8 @@ export default abstract class TestResolverApplicationTestCase extends AbstractAp
     }
 
     if (typeof template === 'string') {
+      // moduleName not passed to this.compile, because *it's just wrong*.
+      // moduleName represents a path-on-disk, and we can't guarantee we have that mapping.
       let toComponent = setComponentTemplate(this.compile(template, {}), templateOnly());
 
       this.resolver!.add(`component:${name}`, toComponent);

From ae90597d6aa8d804e1a66b26f84d613b238697d4 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 8 Apr 2024 15:54:48 -0400
Subject: [PATCH 13/32] progress

---
 .../@ember/-internals/glimmer/lib/resolver.ts   |  6 ++++--
 .../lib/test-cases/test-resolver-application.ts | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index a5285c455ff..2c5ee46d051 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -263,9 +263,11 @@ export default class ResolverImpl
     let key: object;
 
     if (pair.component === null) {
-      if (!isRemoved(DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.options)) {
-        key = template = pair.layout(owner);
+      if (isRemoved(DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.options)) {
+        return null;
       }
+
+      key = template = pair.layout(owner);
     } else {
       key = pair.component;
     }
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 4597004e6db..a181332d739 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,6 +2,7 @@ import AbstractApplicationTestCase from './abstract-application';
 import type Resolver from '../test-resolver';
 import { ModuleBasedResolver } from '../test-resolver';
 import Component, { setComponentTemplate } from '@ember/component';
+import { Component as InternalGlimmerComponent } from '@ember/-internals/glimmer';
 import type { InternalFactory } from '@ember/-internals/owner';
 import templateOnly from '@ember/component/template-only';
 
@@ -41,10 +42,26 @@ export default abstract class TestResolverApplicationTestCase extends AbstractAp
   ) {
     if (ComponentClass) {
       // We cannot set templates multiple times on a class
+      //
+      // Some of this is almost exclusively for the hot-reload test.
+      // But there are a lot of places where it was expected to have multiple templates associated
+      // with the same component class (due to the older resolveable templates)
       if (ComponentClass === Component) {
         ComponentClass = class extends Component {};
       }
 
+      if (ComponentClass === InternalGlimmerComponent) {
+        ComponentClass = class extends InternalGlimmerComponent {};
+      }
+
+      if ('extend' in ComponentClass) {
+        ComponentClass = (ComponentClass as any).extend({});
+      }
+
+      if ((ComponentClass as any).moduleName === '@glimmer/component/template-only') {
+        ComponentClass = templateOnly();
+      }
+
       this.resolver!.add(`component:${name}`, ComponentClass);
 
       if (typeof template === 'string') {

From 1cdf2d7008247a51ebce2f8d265d2f9a85f2efca Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 8 Apr 2024 16:04:04 -0400
Subject: [PATCH 14/32] Progress

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

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 2c5ee46d051..49d606e4152 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -104,6 +104,8 @@ function lookupComponentPair(
   }
 
   if (isRemoved(DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.options)) {
+    if (!component) return null;
+
     return { component, layout: null } as LookupResult;
   }
 

From 80a62a6a5ba3d1c07f911bab437c6b2612418199 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 8 Apr 2024 17:21:55 -0400
Subject: [PATCH 15/32] Progress

---
 .../application/debug-render-tree-test.ts     |   8 +-
 .../components/strict-mode-test.js            |   2 +-
 .../glimmer/tests/integration/mount-test.js   |  25 ++--
 .../@ember/application/tests/visit_test.js    | 114 ++++++++----------
 4 files changed, 69 insertions(+), 80 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 2b260f2ecf0..251640fbcc6 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
@@ -819,7 +819,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
@@ -835,7 +835,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
@@ -844,7 +844,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'second' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
@@ -860,7 +860,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
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 fd11a25c617..01f2ad32399 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
@@ -367,7 +367,7 @@ moduleFor(
     '@test Can use LinkTo'() {
       let Foo = defineComponent({ LinkTo }, '<LinkTo @route="index">Index</LinkTo>');
 
-      this.addComponent('foo', { ComponentClass: Foo });
+      this.add('component:foo', Foo);
       this.addTemplate('index', `<Foo/>`);
 
       return this.visit('/').then(() => {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index b537c7f89bd..ce57ccd5586 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -1,6 +1,7 @@
 import {
   moduleFor,
   ApplicationTestCase,
+  defineComponent,
   ModuleBasedTestResolver,
   RenderingTestCase,
   runTask,
@@ -279,19 +280,17 @@ moduleFor(
             );
             this.register(
               'component:tagless-component',
-              Component.extend({
-                tagName: '',
-                init() {
-                  this._super(...arguments);
-                  component = this;
-                },
-              })
-            );
-            this.register(
-              'template:components/tagless-component',
-              compile('Tagless Component', {
-                moduleName: 'my-app/templates/components/tagless-component.hbs',
-              })
+              defineComponent(
+                {},
+                'Tagless Component',
+                Component.extend({
+                  tagName: '',
+                  init() {
+                    this._super(...arguments);
+                    component = this;
+                  },
+                })
+              )
             );
           },
         })
diff --git a/packages/@ember/application/tests/visit_test.js b/packages/@ember/application/tests/visit_test.js
index ab4f71d9cf0..e8268f55532 100644
--- a/packages/@ember/application/tests/visit_test.js
+++ b/packages/@ember/application/tests/visit_test.js
@@ -3,6 +3,7 @@ import {
   ModuleBasedTestResolver,
   ApplicationTestCase,
   runTask,
+  defineComponent,
 } from 'internal-test-helpers';
 import { service } from '@ember/service';
 import EmberObject from '@ember/object';
@@ -516,12 +517,9 @@ moduleFor(
           this._super.apply(this, args);
           this.register('template:application', compile('{{cache-money}}'));
           this.register(
-            'template:components/cache-money',
-            compile(`
-          <p>Dis cache money</p>
-        `)
+            'component:cache-money',
+            defineComponent({}, `<p>Dis cache money</p>`, Component.extend({}))
           );
-          this.register('component:cache-money', Component.extend({}));
         },
       });
       this.add('engine:blog', BlogEngine);
@@ -560,12 +558,9 @@ moduleFor(
           this._super.apply(this, args);
           this.register('template:application', compile('{{cache-money}}'));
           this.register(
-            'template:components/cache-money',
-            compile(`
-          <p>Dis cache money</p>
-        `)
+            'component:cache-money',
+            defineComponent({}, `<p>Dis cache money</p>`, Component.extend({}))
           );
-          this.register('component:cache-money', Component.extend({}));
         },
       });
       this.add('engine:blog', BlogEngine);
@@ -663,64 +658,59 @@ moduleFor(
 
       this.addTemplate('show', '{{component @model.componentName model=@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: service(),
-          sharedCounter: service(),
-
-          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 {{on "click" this.incrementCounter}}>Join {{this.counter.value}} others in clicking me!</button>
-        `
+        defineComponent(
+          {},
+          `<h1>X-Foo</h1>
+           <p>Hello {{@model.name}}, I have been clicked {{this.isolatedCounter.value}} times ({{this.sharedCounter.value}} times combined)!</p>`,
+
+          Component.extend({
+            tagName: 'x-foo',
+
+            isolatedCounter: service(),
+            sharedCounter: service(),
+
+            init() {
+              this._super();
+              xFooInitCalled = true;
+            },
+
+            didInsertElement() {
+              xFooDidInsertElementCalled = true;
+            },
+
+            click() {
+              this.get('isolatedCounter').increment();
+              this.get('sharedCounter').increment();
+            },
+          })
+        )
       );
 
       this.add(
         'component:x-bar',
-        Component.extend({
-          counter: service('sharedCounter'),
-
-          incrementCounter: action(function () {
-            this.get('counter').increment();
-          }),
-
-          init() {
-            this._super();
-            xBarInitCalled = true;
-          },
-
-          didInsertElement() {
-            xBarDidInsertElementCalled = true;
-          },
-        })
+        defineComponent(
+          null,
+          `<h1>X-Bar</h1>
+          <button {{on "click" this.incrementCounter}}>Join {{this.counter.value}} others in clicking me!</button>`,
+          Component.extend({
+            counter: service('sharedCounter'),
+
+            incrementCounter: action(function () {
+              this.get('counter').increment();
+            }),
+
+            init() {
+              this._super();
+              xBarInitCalled = true;
+            },
+
+            didInsertElement() {
+              xBarDidInsertElementCalled = true;
+            },
+          })
+        )
       );
 
       let fixtureElement = document.querySelector('#qunit-fixture');

From 3851dc27a295d79bd2650c8d36f536cb25a92e79 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 8 Apr 2024 18:05:07 -0400
Subject: [PATCH 16/32] 4 tests left

---
 .../ember/tests/application_lifecycle_test.js | 37 ++++++++++++-------
 .../tests/component_registration_test.js      | 22 +++++++----
 .../tests/integration/multiple-app-test.js    | 29 ++++++---------
 3 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/packages/ember/tests/application_lifecycle_test.js b/packages/ember/tests/application_lifecycle_test.js
index 0b7d080b7ab..8fcf689361b 100644
--- a/packages/ember/tests/application_lifecycle_test.js
+++ b/packages/ember/tests/application_lifecycle_test.js
@@ -1,4 +1,9 @@
-import { moduleFor, AutobootApplicationTestCase, runTask } from 'internal-test-helpers';
+import {
+  moduleFor,
+  AutobootApplicationTestCase,
+  runTask,
+  defineComponent,
+} from 'internal-test-helpers';
 import Application from '@ember/application';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
@@ -140,15 +145,18 @@ moduleFor(
 
         this.add(
           'component:foo-bar',
-          Component.extend({
-            wowza() {
-              assert.ok(true, 'fired the event!');
-            },
-          })
+          defineComponent(
+            {},
+            `<div id='wowza-thingy'></div>`,
+            Component.extend({
+              wowza() {
+                assert.ok(true, 'fired the event!');
+              },
+            })
+          )
         );
 
         this.addTemplate('application', `{{foo-bar}}`);
-        this.addTemplate('components/foo-bar', `<div id='wowza-thingy'></div>`);
       });
 
       this.$('#wowza-thingy').trigger('wowza');
@@ -172,15 +180,18 @@ moduleFor(
 
         this.add(
           'component:foo-bar',
-          Component.extend({
-            jerky() {
-              assert.ok(true, 'fired the event!');
-            },
-          })
+          defineComponent(
+            {},
+            `<div id='herky-thingy'></div>`,
+            Component.extend({
+              jerky() {
+                assert.ok(true, 'fired the event!');
+              },
+            })
+          )
         );
 
         this.addTemplate('application', `{{foo-bar}}`);
-        this.addTemplate('components/foo-bar', `<div id='herky-thingy'></div>`);
       });
 
       this.$('#herky-thingy').trigger('herky');
diff --git a/packages/ember/tests/component_registration_test.js b/packages/ember/tests/component_registration_test.js
index bb7dacb694a..2fe0490366d 100644
--- a/packages/ember/tests/component_registration_test.js
+++ b/packages/ember/tests/component_registration_test.js
@@ -2,8 +2,9 @@ import Application from '@ember/application';
 import Controller from '@ember/controller';
 import { Component } from '@ember/-internals/glimmer';
 import { compile } from 'ember-template-compiler';
-import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
+import { moduleFor, testUnless, ApplicationTestCase, defineComponent } from 'internal-test-helpers';
 import { DEBUG } from '@glimmer/env';
+import { DEPRECATIONS } from '@ember/-internals/deprecations';
 
 moduleFor(
   'Application Lifecycle - Component Registration',
@@ -23,7 +24,6 @@ moduleFor(
     }
 
     ['@test If a component is registered, it is used'](assert) {
-      this.addTemplate('components/expand-it', '<p>hello {{yield}}</p>');
       this.addTemplate('application', `Hello world {{#expand-it}}world{{/expand-it}}`);
 
       this.application.instanceInitializer({
@@ -31,9 +31,13 @@ moduleFor(
         initialize(applicationInstance) {
           applicationInstance.register(
             'component:expand-it',
-            Component.extend({
-              classNames: 'testing123',
-            })
+            defineComponent(
+              {},
+              `<p>hello {{yield}}</p>`,
+              Component.extend({
+                classNames: 'testing123',
+              })
+            )
           );
         },
       });
@@ -70,7 +74,9 @@ moduleFor(
       });
     }
 
-    ['@test Late-registered components can be rendered with template registered on the container'](
+    [`${testUnless(
+      DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved
+    )} Late-registered components can be rendered with template registered on the container`](
       assert
     ) {
       this.addTemplate(
@@ -104,7 +110,9 @@ moduleFor(
       });
     }
 
-    ['@test Late-registered components can be rendered with ONLY the template registered on the container'](
+    [`${testUnless(
+      DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved
+    )} Late-registered components can be rendered with ONLY the template registered on the container`](
       assert
     ) {
       this.addTemplate(
diff --git a/packages/ember/tests/integration/multiple-app-test.js b/packages/ember/tests/integration/multiple-app-test.js
index 656647275d9..0674c7350ad 100644
--- a/packages/ember/tests/integration/multiple-app-test.js
+++ b/packages/ember/tests/integration/multiple-app-test.js
@@ -1,4 +1,4 @@
-import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
+import { moduleFor, ApplicationTestCase, runTask, defineComponent } from 'internal-test-helpers';
 import Application from '@ember/application';
 import { Component } from '@ember/-internals/glimmer';
 import { getOwner } from '@ember/-internals/owner';
@@ -48,12 +48,16 @@ moduleFor(
     addFactoriesToResolver(actions, resolver) {
       resolver.add(
         'component:special-button',
-        Component.extend({
-          doStuff: action(function () {
-            let rootElement = getOwner(this).application.rootElement;
-            actions.push(rootElement);
-          }),
-        })
+        defineComponent(
+          null,
+          `<button class='do-stuff' {{on "click" this.doStuff}}>Button</button>`,
+          Component.extend({
+            doStuff: action(function () {
+              let rootElement = getOwner(this).application.rootElement;
+              actions.push(rootElement);
+            }),
+          })
+        )
       );
 
       resolver.add(
@@ -67,17 +71,6 @@ moduleFor(
           }
         )
       );
-      resolver.add(
-        'template:components/special-button',
-        this.compile(
-          `
-        <button class='do-stuff' {{on "click" this.doStuff}}>Button</button>
-      `,
-          {
-            moduleName: 'my-app/templates/components/special-button.hbs',
-          }
-        )
-      );
     }
 
     [`@test booting multiple applications can properly handle events`](assert) {

From 664bab0d1b02e62db9129ce80e22c9a101180568 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 8 Apr 2024 18:08:40 -0400
Subject: [PATCH 17/32] lints

---
 .../glimmer/tests/integration/application/engine-test.js        | 2 --
 1 file changed, 2 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 50ba88c7917..1354ef45fd9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -4,7 +4,6 @@ import {
   ModuleBasedTestResolver,
   strip,
   runTaskNext,
-  expectDeprecation,
 } from 'internal-test-helpers';
 
 import { Component } from '@ember/-internals/glimmer';
@@ -17,7 +16,6 @@ import { next } from '@ember/runloop';
 import { compile } from '../../utils/helpers';
 import { setComponentTemplate } from '@glimmer/manager';
 import { templateOnlyComponent } from '@glimmer/runtime';
-import { DEPRECATIONS } from '../../../../deprecations';
 
 moduleFor(
   'Application test: engine rendering',

From ea8d1561fe57e7fbbee80d7eec54cf233bdfe339 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 8 Apr 2024 18:20:03 -0400
Subject: [PATCH 18/32] Done?

---
 .../tests/integration/components/append-test.js   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

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 98eb9e9b47b..154fd7419f9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
@@ -1,8 +1,9 @@
-import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
+import { moduleFor, RenderingTestCase, strip, runTask, testUnless } from 'internal-test-helpers';
 
 import { set } from '@ember/object';
 
 import { Component, compile } from '../../utils/helpers';
+import { DEPRECATIONS } from '../../../../deprecations';
 
 class AbstractAppendTest extends RenderingTestCase {
   constructor() {
@@ -37,7 +38,9 @@ class AbstractAppendTest extends RenderingTestCase {
     this.ids.push(component.elementId);
   }
 
-  ['@test lifecycle hooks during component append'](assert) {
+  [`${testUnless(
+    DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved
+  )} lifecycle hooks during component append`](assert) {
     let hooks = [];
 
     let oldRegisterComponent = this.registerComponent;
@@ -283,7 +286,9 @@ class AbstractAppendTest extends RenderingTestCase {
     );
   }
 
-  ['@test appending, updating and destroying a single component'](assert) {
+  [`${testUnless(
+    DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved
+  )} appending, updating and destroying a single component`](assert) {
     let willDestroyCalled = 0;
 
     this.registerComponent('x-parent', {
@@ -389,7 +394,9 @@ class AbstractAppendTest extends RenderingTestCase {
     assert.equal(renderer._roots.length, 0, 'released the root component');
   }
 
-  ['@test appending, updating and destroying multiple components'](assert) {
+  [`${testUnless(
+    DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved
+  )} appending, updating and destroying multiple components`](assert) {
     let willDestroyCalled = 0;
 
     this.registerComponent('x-first', {

From 563ddc0402803ac8f52eeba3217a7ce9b761016d Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 8 Apr 2024 18:26:11 -0400
Subject: [PATCH 19/32] 'Fix' type errors

---
 packages/@ember/-internals/glimmer/lib/resolver.ts         | 2 +-
 .../lib/test-cases/test-resolver-application.ts            | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 49d606e4152..36391c05d79 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,6 +1,6 @@
 import type { InternalFactory, InternalOwner, RegisterOptions } from '@ember/-internals/owner';
 import { isFactory } from '@ember/-internals/owner';
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
 import type {
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 a181332d739..ea4b4d6df64 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
@@ -46,6 +46,9 @@ export default abstract class TestResolverApplicationTestCase extends AbstractAp
       // Some of this is almost exclusively for the hot-reload test.
       // But there are a lot of places where it was expected to have multiple templates associated
       // with the same component class (due to the older resolveable templates)
+      //
+      // We'll want to clean thsi up over time, and probably phase out `addComponent` entirely,
+      // and expclusively use `add` w/ `defineComponent`
       if (ComponentClass === Component) {
         ComponentClass = class extends Component {};
       }
@@ -62,12 +65,12 @@ export default abstract class TestResolverApplicationTestCase extends AbstractAp
         ComponentClass = templateOnly();
       }
 
-      this.resolver!.add(`component:${name}`, ComponentClass);
+      this.resolver!.add(`component:${name}`, ComponentClass as Component);
 
       if (typeof template === 'string') {
         // moduleName not passed to this.compile, because *it's just wrong*.
         // moduleName represents a path-on-disk, and we can't guarantee we have that mapping.
-        setComponentTemplate(this.compile(template, {}), ComponentClass);
+        setComponentTemplate(this.compile(template, {}), ComponentClass as Component);
       }
 
       return;

From 14eb06c90bb0bfaa4211c8f7a62c45a5594b89e0 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 8 Apr 2024 20:02:27 -0400
Subject: [PATCH 20/32] I think everything is green?

---
 .../integration/application/debug-render-tree-test.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 251640fbcc6..fdec69d40a2 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
@@ -892,7 +892,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
@@ -908,7 +908,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
@@ -917,7 +917,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'second' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
@@ -933,7 +933,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
             instance: null,
-            template: 'my-app/templates/components/hello-world.hbs',
+            template: '(unknown template module)',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },

From 4f90a1a9211760f2833852290db7761866761be6 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:40:49 -0400
Subject: [PATCH 21/32] Make smoke-tests pass again

---
 smoke-tests/ember-test-app/package.json | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/smoke-tests/ember-test-app/package.json b/smoke-tests/ember-test-app/package.json
index fcefe5f4962..14812a106b0 100644
--- a/smoke-tests/ember-test-app/package.json
+++ b/smoke-tests/ember-test-app/package.json
@@ -19,19 +19,19 @@
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "npm-run-all --print-name \"lint\" \"test:*\"",
+    "test": "ember test",
     "test:ember": "ember test"
   },
   "devDependencies": {
     "@babel/core": "^7.24.4",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.1",
-    "@ember/test-helpers": "^2.8.1",
+    "@ember/test-helpers": "^3.3.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^2.4.3",
+<<<<<<< HEAD
     "ember-cli": "~4.8.0",
     "ember-cli-app-version": "^5.0.0",
     "ember-cli-babel": "^8.2.0",
@@ -40,26 +40,26 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.11.0",
+    "ember-data": "~5.3.3",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
-    "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.0.0",
-    "ember-resolver": "^8.0.3",
+    "ember-page-title": "^8.2.3",
+    "ember-qunit": "^8.0.2",
+    "ember-resolver": "^11.0.1",
     "ember-source": "~4.8.0",
-    "ember-template-lint": "^4.16.1",
-    "ember-welcome-page": "^6.2.0",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-ember": "^11.1.0",
+    "ember-template-lint": "^6.0.0",
+    "ember-welcome-page": "^7.0.2",
+    "eslint": "^8.0.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-ember": "^12.0.2",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-qunit": "^7.3.1",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-qunit": "^8.1.1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.7.1",
+    "prettier": "^3.2.5",
     "qunit": "^2.19.2",
-    "qunit-dom": "^2.0.0",
+    "qunit-dom": "^3.1.1",
     "webpack": "^5.74.0"
   },
   "engines": {

From 178e8918af703a5d6a25f3b6b2cb7d57cad72134 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Tue, 9 Apr 2024 15:48:34 -0400
Subject: [PATCH 22/32] idk how to fix this

---
 smoke-tests/ember-test-app/package.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/smoke-tests/ember-test-app/package.json b/smoke-tests/ember-test-app/package.json
index 14812a106b0..2dc788d1144 100644
--- a/smoke-tests/ember-test-app/package.json
+++ b/smoke-tests/ember-test-app/package.json
@@ -31,9 +31,8 @@
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^2.4.3",
-<<<<<<< HEAD
-    "ember-cli": "~4.8.0",
-    "ember-cli-app-version": "^5.0.0",
+    "ember-cli": "~5.7.0",
+    "ember-cli-app-version": "^6.0.1",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-htmlbars": "^6.1.1",

From 10f2d8c90dd2203953e35f074833a9d1ae416438 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 10 Apr 2024 16:41:38 -0400
Subject: [PATCH 23/32] Yay

---
 .../@ember/-internals/glimmer/lib/component-managers/curly.ts   | 2 +-
 1 file changed, 1 insertion(+), 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 60c76a13084..2d1e69c09fd 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -4,6 +4,7 @@ import {
   getOwner,
   setOwner,
 } from '@ember/-internals/owner';
+import { getComponentTemplate } from '@glimmer/manager';
 import { enumerableSymbol, guidFor } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
 import type { Nullable } from '@ember/-internals/utility-types';
@@ -51,7 +52,6 @@ import {
 
 import ComponentStateBucket from '../utils/curly-component-state-bucket';
 import { processComponentArgs } from '../utils/process-args';
-import { getComponentTemplate } from '@ember/component';
 
 export const ARGS = enumerableSymbol('ARGS');
 export const HAS_BLOCK = enumerableSymbol('HAS_BLOCK');

From 4985f910e013ddd129c270d56034a4717f8a883c Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 18 Apr 2024 13:03:25 -0400
Subject: [PATCH 24/32] Remove code from curly manager that is no longer needed

---
 .../-internals/glimmer/lib/component-managers/curly.ts      | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 2d1e69c09fd..e549079154e 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -134,12 +134,6 @@ export default class CurlyComponentManager
     let factory: TemplateFactory;
 
     if (layout === undefined) {
-      let theSetTemplate = getComponentTemplate(component);
-
-      if (theSetTemplate) {
-        return unwrapTemplate(theSetTemplate(owner)).asWrappedLayout();
-      }
-
       if (layoutName !== undefined) {
         let _factory = owner.lookup(`template:${layoutName}`) as TemplateFactory;
         assert(`Layout \`${layoutName}\` not found!`, _factory !== undefined);

From 869b733b77575cb539a6931bf5fdf26f54b522d9 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 18 Apr 2024 13:04:44 -0400
Subject: [PATCH 25/32] Change from isRemoved() to .isRemoved

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

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 36391c05d79..e7c4ccfdd50 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -45,7 +45,7 @@ import { default as uniqueId } from './helpers/unique-id';
 import actionModifier from './modifiers/action';
 import { mountHelper } from './syntax/mount';
 import { outletHelper } from './syntax/outlet';
-import { DEPRECATIONS, deprecateUntil, isRemoved } from '@ember/-internals/deprecations';
+import { DEPRECATIONS, deprecateUntil } from '@ember/-internals/deprecations';
 
 function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
@@ -103,7 +103,7 @@ function lookupComponentPair(
     }
   }
 
-  if (isRemoved(DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.options)) {
+  if (DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved) {
     if (!component) return null;
 
     return { component, layout: null } as LookupResult;
@@ -265,7 +265,7 @@ export default class ResolverImpl
     let key: object;
 
     if (pair.component === null) {
-      if (isRemoved(DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.options)) {
+      if (DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved) {
         return null;
       }
 

From 5c11fd2804d6ed8340becdd4d39caac174e8f4e6 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 18 Apr 2024 13:18:32 -0400
Subject: [PATCH 26/32] cleanup

---
 .../@ember/-internals/glimmer/lib/component-managers/curly.ts    | 1 -
 1 file changed, 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 e549079154e..23d004c28f5 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 {
   getOwner,
   setOwner,
 } from '@ember/-internals/owner';
-import { getComponentTemplate } from '@glimmer/manager';
 import { enumerableSymbol, guidFor } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
 import type { Nullable } from '@ember/-internals/utility-types';

From 2fe2ec9f4a21905bd45016b2c346809bc75631e0 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 19 Apr 2024 14:42:13 -0400
Subject: [PATCH 27/32] Move deprecation to be if layoutFor has a result only

---
 packages/@ember/-internals/glimmer/lib/resolver.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index e7c4ccfdd50..18d268f750b 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -66,12 +66,16 @@ function layoutFor(
 ): Nullable<Template> {
   let templateFullName = `template:components/${name}` as const;
 
-  deprecateUntil(
-    `Components with separately resolved templates are deprecated. Migrate to either co-located js/ts + hbs files or to gjs/gts. Tried to lookup '${templateFullName}'.`,
-    DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING
-  );
+  let result = (owner.lookup(templateFullName, options) as Template) || null;
 
-  return (owner.lookup(templateFullName, options) as Template) || null;
+  if (result) {
+    deprecateUntil(
+      `Components with separately resolved templates are deprecated. Migrate to either co-located js/ts + hbs files or to gjs/gts. Tried to lookup '${templateFullName}'.`,
+      DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING
+    );
+  }
+
+  return result;
 }
 
 type LookupResult =

From 06268ce59b85394352e024867648dfac51b9ae5b Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 19 Apr 2024 18:52:02 -0400
Subject: [PATCH 28/32] Add a non-deprecated version of the append lifecycle
 test

---
 .../integration/components/append-test.js     | 241 ++++++++++++++++++
 1 file changed, 241 insertions(+)

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 154fd7419f9..e2ca6840649 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
@@ -4,6 +4,7 @@ import { set } from '@ember/object';
 
 import { Component, compile } from '../../utils/helpers';
 import { DEPRECATIONS } from '../../../../deprecations';
+import { setComponentTemplate } from '@glimmer/manager';
 
 class AbstractAppendTest extends RenderingTestCase {
   constructor() {
@@ -38,6 +39,246 @@ class AbstractAppendTest extends RenderingTestCase {
     this.ids.push(component.elementId);
   }
 
+  [`@test (new) lifecycle hooks during component append`](assert) {
+    let hooks = [];
+
+    let componentsByName = {};
+
+    let createLogger = (name, template, extras = {}) => {
+      function pushHook(hookName) {
+        hooks.push([name, hookName]);
+      }
+
+      let LoggerComponent = Component.extend({
+        init() {
+          this._super(...arguments);
+          if (name in componentsByName) {
+            throw new TypeError('Component named: ` ' + name + ' ` already registered');
+          }
+          componentsByName[name] = this;
+          pushHook('init');
+          this.on('init', () => pushHook('on(init)'));
+        },
+
+        didReceiveAttrs() {
+          pushHook('didReceiveAttrs');
+        },
+
+        willInsertElement() {
+          pushHook('willInsertElement');
+        },
+
+        willRender() {
+          pushHook('willRender');
+        },
+
+        didInsertElement() {
+          pushHook('didInsertElement');
+        },
+
+        didRender() {
+          pushHook('didRender');
+        },
+
+        didUpdateAttrs() {
+          pushHook('didUpdateAttrs');
+        },
+
+        willUpdate() {
+          pushHook('willUpdate');
+        },
+
+        didUpdate() {
+          pushHook('didUpdate');
+        },
+
+        willDestroyElement() {
+          pushHook('willDestroyElement');
+        },
+
+        willClearRender() {
+          pushHook('willClearRender');
+        },
+
+        didDestroyElement() {
+          pushHook('didDestroyElement');
+        },
+
+        willDestroy() {
+          pushHook('willDestroy');
+          this._super(...arguments);
+        },
+      });
+
+      let local = LoggerComponent.extend(extras);
+
+      setComponentTemplate(compile(template), local);
+
+      this.owner.register(`component:${name}`, local);
+
+      return local;
+    };
+
+    createLogger(
+      'x-parent',
+      `[parent: {{this.foo}}]
+       [parent: {{this.parentValue}}
+
+        <XChild @bar={{this.foo}} @childValue={{this.childValue}}>
+         [yielded: {{this.foo}}]
+        </XChild>
+      `
+    );
+    createLogger(
+      'x-child',
+      `
+      [child: {{this.bar}}]
+      [child: {{this.childValue}}]
+      {{yield}}`
+    );
+
+    this.render(
+      `
+      {{#if this.show}}
+        <XParent @foo={{this.foo}} @parentValue={{this.parentValue}} @childValue={{this.childValue}} />
+      {{/if}}`,
+      { parentValue: 1, childValue: 1, foo: 'zomg', show: true }
+    );
+
+    assert.deepEqual(
+      hooks,
+      [
+        ['x-parent', 'init'],
+        ['x-parent', 'on(init)'],
+        ['x-parent', 'didReceiveAttrs'],
+        ['x-parent', 'willRender'],
+        ['x-parent', 'willInsertElement'],
+        ['x-child', 'init'],
+        ['x-child', 'on(init)'],
+        ['x-child', 'didReceiveAttrs'],
+        ['x-child', 'willRender'],
+        ['x-child', 'willInsertElement'],
+        ['x-child', 'didInsertElement'],
+        ['x-child', 'didRender'],
+        ['x-parent', 'didInsertElement'],
+        ['x-parent', 'didRender'],
+      ],
+      'creation of x-parent'
+    );
+
+    hooks.length = 0;
+    runTask(() => this.rerender());
+
+    assert.deepEqual(hooks, [], 'no-op re-render of parent');
+
+    hooks.length = 0;
+
+    runTask(() => set(this.context, 'parentValue', 2));
+    runTask(() => this.rerender());
+
+    assert.deepEqual(
+      hooks,
+      [
+        ['x-parent', 'didUpdateAttrs'],
+        ['x-parent', 'didReceiveAttrs'],
+        ['x-parent', 'willUpdate'],
+        ['x-parent', 'willRender'],
+        ['x-parent', 'didUpdate'],
+        ['x-parent', 'didRender'],
+      ],
+      'rerender x-parent'
+    );
+
+    hooks.length = 0;
+
+    runTask(() => set(this.context, 'childValue', 2));
+
+    assert.deepEqual(
+      hooks,
+
+      [
+        ['x-parent', 'didUpdateAttrs'],
+        ['x-parent', 'didReceiveAttrs'],
+        ['x-parent', 'willUpdate'],
+        ['x-parent', 'willRender'],
+        ['x-child', 'didUpdateAttrs'],
+        ['x-child', 'didReceiveAttrs'],
+        ['x-child', 'willUpdate'],
+        ['x-child', 'willRender'],
+        ['x-child', 'didUpdate'],
+        ['x-child', 'didRender'],
+        ['x-parent', 'didUpdate'],
+        ['x-parent', 'didRender'],
+      ],
+      'rerender x-child'
+    );
+
+    hooks.length = 0;
+
+    runTask(() => set(this.context, 'foo', 'wow'));
+
+    assert.deepEqual(
+      hooks,
+      [
+        ['x-parent', 'didUpdateAttrs'],
+        ['x-parent', 'didReceiveAttrs'],
+        ['x-parent', 'willUpdate'],
+        ['x-parent', 'willRender'],
+        ['x-child', 'didUpdateAttrs'],
+        ['x-child', 'didReceiveAttrs'],
+        ['x-child', 'willUpdate'],
+        ['x-child', 'willRender'],
+        ['x-child', 'didUpdate'],
+        ['x-child', 'didRender'],
+        ['x-parent', 'didUpdate'],
+        ['x-parent', 'didRender'],
+      ],
+      'set foo = wow'
+    );
+
+    hooks.length = 0;
+
+    runTask(() => set(this.context, 'foo', 'zomg'));
+
+    assert.deepEqual(
+      hooks,
+      [
+        ['x-parent', 'didUpdateAttrs'],
+        ['x-parent', 'didReceiveAttrs'],
+        ['x-parent', 'willUpdate'],
+        ['x-parent', 'willRender'],
+        ['x-child', 'didUpdateAttrs'],
+        ['x-child', 'didReceiveAttrs'],
+        ['x-child', 'willUpdate'],
+        ['x-child', 'willRender'],
+        ['x-child', 'didUpdate'],
+        ['x-child', 'didRender'],
+        ['x-parent', 'didUpdate'],
+        ['x-parent', 'didRender'],
+      ],
+      'set foo = zomg'
+    );
+
+    hooks.length = 0;
+
+    runTask(() => set(this.context, 'show', false));
+
+    assert.deepEqual(
+      hooks,
+      [
+        ['x-parent', 'willDestroyElement'],
+        ['x-parent', 'willClearRender'],
+        ['x-child', 'willDestroyElement'],
+        ['x-child', 'willClearRender'],
+        ['x-parent', 'didDestroyElement'],
+        ['x-child', 'didDestroyElement'],
+        ['x-parent', 'willDestroy'],
+        ['x-child', 'willDestroy'],
+      ],
+      'destroy'
+    );
+  }
+
   [`${testUnless(
     DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved
   )} lifecycle hooks during component append`](assert) {

From 79ede0ea04bda553bdec410e3f61cf82b6626141 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 22 Apr 2024 23:22:12 -0400
Subject: [PATCH 29/32] Re-fix upstream-changed test

---
 packages/ember/tests/component_registration_test.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/ember/tests/component_registration_test.js b/packages/ember/tests/component_registration_test.js
index 2fe0490366d..4139bc55125 100644
--- a/packages/ember/tests/component_registration_test.js
+++ b/packages/ember/tests/component_registration_test.js
@@ -5,6 +5,7 @@ import { compile } from 'ember-template-compiler';
 import { moduleFor, testUnless, ApplicationTestCase, defineComponent } from 'internal-test-helpers';
 import { DEBUG } from '@glimmer/env';
 import { DEPRECATIONS } from '@ember/-internals/deprecations';
+import templateOnly from '@ember/component/template-only';
 
 moduleFor(
   'Application Lifecycle - Component Registration',
@@ -15,7 +16,10 @@ moduleFor(
     }
 
     ['@test The helper becomes the body of the component']() {
-      this.addTemplate('components/expand-it', '<p>hello {{yield}}</p>');
+      this.addComponent('expand-it', {
+        ComponentClass: templateOnly(),
+        template: '<p>hello {{yield}}</p>',
+      });
       this.addTemplate('application', 'Hello world {{#expand-it}}world{{/expand-it}}');
 
       return this.visit('/').then(() => {

From f17365fb429ee1b285b966b7e3c401cf0473b8b1 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 25 Apr 2024 16:18:40 -0400
Subject: [PATCH 30/32] Move early nullification to layoutFor

---
 packages/@ember/-internals/glimmer/lib/resolver.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 18d268f750b..ac3c082c68f 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -64,6 +64,10 @@ function layoutFor(
   owner: InternalOwner,
   options?: RegisterOptions
 ): Nullable<Template> {
+  if (DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved) {
+    return null;
+  }
+
   let templateFullName = `template:components/${name}` as const;
 
   let result = (owner.lookup(templateFullName, options) as Template) || null;
@@ -107,12 +111,6 @@ function lookupComponentPair(
     }
   }
 
-  if (DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved) {
-    if (!component) return null;
-
-    return { component, layout: null } as LookupResult;
-  }
-
   let layout = layoutFor(name, owner, options);
 
   if (component === null && layout === null) {

From 52978cd375785effd2e0ec9c34f1a16fffb64224 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 25 Apr 2024 16:20:46 -0400
Subject: [PATCH 31/32] Remove unneeded branch

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

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index ac3c082c68f..3df207331b0 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -267,10 +267,6 @@ export default class ResolverImpl
     let key: object;
 
     if (pair.component === null) {
-      if (DEPRECATIONS.DEPRECATE_COMPONENT_TEMPLATE_RESOLVING.isRemoved) {
-        return null;
-      }
-
       key = template = pair.layout(owner);
     } else {
       key = pair.component;

From eb8fc81d7ea1d18b466caa3b19189720495a6002 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 25 Apr 2024 16:27:46 -0400
Subject: [PATCH 32/32] Fix qunit param

---
 tests/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/index.html b/tests/index.html
index f2bb0998b63..c7bb55176d5 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -104,7 +104,7 @@
         QUnit.config.urlConfig.push('forceskip');
 
         QUnit.config.urlConfig.push({
-          id: 'overridedeprecationversion',
+          id: 'OVERRIDE_DEPRECATION_VERSION',
           value: ['20.0.0', '6.0.0', '5.12.0'],
           label: 'Deprecation Version',
         });