Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[backport] Avoid unnecessary dependencies on @glimmer types #1305

Merged
merged 2 commits into from
Dec 21, 2022
Merged

[backport] Avoid unnecessary dependencies on @glimmer types #1305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
421d2a0
`render` accepts any object with a component manager
dfreeman Dec 21, 2022
20c6cf9
Avoid unnecessarily relying on Glimmer's internal component manager type
dfreeman Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions addon-test-support/@ember/test-helpers/-internal/get-component-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
9 changes: 4 additions & 5 deletions addon-test-support/@ember/test-helpers/setup-rendering-context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 1 addition & 4 deletions type-tests/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>>();

Expand Down