Merge pull request #1305 from dfreeman/render-any-object-v2

[backport] Avoid unnecessary dependencies on `@glimmer` types
emberjs · Dec 21, 2022 · caef86e · caef86e
2 parents e3f1cb8 + 20c6cf9
commit caef86e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/addon-test-support/@ember/test-helpers/-internal/get-component-manager.ts b/addon-test-support/@ember/test-helpers/-internal/get-component-manager.ts
@@ -4,12 +4,8 @@ import {
   importSync,
   dependencySatisfies,
 } from '@embroider/macros';
-import type { InternalComponentManager } from '@glimmer/interfaces';
 
-let getComponentManager: (
-  definition: object,
-  owner: object
-) => InternalComponentManager | null;
+let getComponentManager: (definition: object, owner: object) => unknown;
 
 if (macroCondition(dependencySatisfies('ember-source', '>=3.27.0-alpha.1'))) {
   let _getComponentManager =

diff --git a/addon-test-support/@ember/test-helpers/setup-rendering-context.ts b/addon-test-support/@ember/test-helpers/setup-rendering-context.ts
@@ -10,7 +10,7 @@ import {
 } from './setup-context';
 import { Promise } from './-utils';
 import settled from './settled';
-import { hbs, TemplateFactory } from 'ember-cli-htmlbars';
+import { hbs } from 'ember-cli-htmlbars';
 import getRootElement from './dom/get-root-element';
 import { Owner } from './build-owner';
 import getTestMetadata from './test-metadata';
@@ -21,14 +21,13 @@ import isComponent from './-internal/is-component';
 import { macroCondition, dependencySatisfies } from '@embroider/macros';
 import { ComponentRenderMap, SetUsage } from './setup-context';
 import { ensureSafeComponent } from '@embroider/util';
-import type { ComponentInstance } from '@glimmer/interfaces';
 
 const OUTLET_TEMPLATE = hbs`{{outlet}}`;
 const EMPTY_TEMPLATE = hbs``;
 const INVOKE_PROVIDED_COMPONENT = hbs`<this.ProvidedComponent />`;
 
 export interface RenderingTestContext extends TestContext {
-  render(template: TemplateFactory): Promise<void>;
+  render(template: object): Promise<void>;
   clearRender(): Promise<void>;
 
   element: Element | Document;
@@ -100,7 +99,7 @@ export interface RenderOptions {
   await render(hbs`<div class="container"></div>`);
 */
 export function render(
-  templateOrComponent: TemplateFactory | ComponentInstance,
+  templateOrComponent: object,
   options?: RenderOptions
 ): Promise<void> {
   let context = getContext();
@@ -298,7 +297,7 @@ export default function setupRenderingContext(
     .then(() => {
       let { owner } = context;
 
-      let renderDeprecationWrapper = function (template: TemplateFactory) {
+      let renderDeprecationWrapper = function (template: object) {
         deprecate(
           'Using this.render has been deprecated, consider using `render` imported from `@ember/test-helpers`.',
           false,

diff --git a/type-tests/api.ts b/type-tests/api.ts
@@ -156,10 +156,7 @@ expectTypeOf(currentURL).toEqualTypeOf<() => string>();
 
 // Rendering Helpers
 expectTypeOf(render).toMatchTypeOf<
-  (
-    templateOrComponent: TemplateFactory | ComponentInstance,
-    options?: { owner?: Owner }
-  ) => Promise<void>
+  (templateOrComponent: object, options?: { owner?: Owner }) => Promise<void>
 >();
 expectTypeOf(clearRender).toEqualTypeOf<() => Promise<void>>();