Merge pull request #1404 from gitKrystan/fix-is-component

addon/addon-test-support/@ember/test-helpers/-internal/is-component.ts

@@ -1,35 +1,16 @@
 import type { ComponentLike } from '@glint/template';
 
-import getComponentManager from './get-component-manager';
+import { getInternalComponentManager as getComponentManager } from '@glimmer/manager';
 
 /**
  * We should ultimately get a new API from @glimmer/runtime that provides this functionality
  * (see https://github.com/emberjs/rfcs/pull/785 for more info).
  * @private
  * @param {Object} maybeComponent The thing you think might be a component
- * @param {Object} owner Owner, we need this for old versions of getComponentManager
  * @returns {boolean} True if it's a component, false if not
  */
-function isComponent(
-  maybeComponent: object,
-  owner: object
-): maybeComponent is ComponentLike {
-  // SAFETY: in more recent versions of @glimmer/manager,
-  //         this throws an error when maybeComponent does not have
-  //         an associated manager.
-  try {
-    return !!getComponentManager(maybeComponent, owner);
-  } catch (e) {
-    if (
-      `${e}`.includes(
-        `wasn't a component manager associated with the definition`
-      )
-    ) {
-      return false;
-    }
-
-    throw e;
-  }
+function isComponent(maybeComponent: object): maybeComponent is ComponentLike {
+  return !!getComponentManager(maybeComponent, true);
 }
 
 export default isComponent;

addon/addon-test-support/@ember/test-helpers/setup-rendering-context.ts

@@ -128,7 +128,7 @@ export function render(
       let OutletTemplate = lookupOutletTemplate(owner);
       let ownerToRenderFrom = options?.owner || owner;
 
-      if (isComponent(templateOrComponent, owner)) {
+      if (isComponent(templateOrComponent)) {
         // We use this to track when `render` is used with a component so that we can throw an
         // assertion if `this.{set,setProperty} is used in the same test
         ComponentRenderMap.set(context, true);