From d816a0a6c9e9406cb9ee6b5c9c1c92442b2df1e8 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sat, 23 Nov 2024 20:42:31 -0500 Subject: [PATCH] Handle CurriedType.Component removal --- packages/@ember/-internals/glimmer/lib/renderer.ts | 6 +++--- packages/@ember/-internals/glimmer/lib/syntax/outlet.ts | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts index d5b3aa62929..712b715aad3 100644 --- a/packages/@ember/-internals/glimmer/lib/renderer.ts +++ b/packages/@ember/-internals/glimmer/lib/renderer.ts @@ -8,6 +8,7 @@ import { assert } from '@ember/debug'; import { _backburner, _getCurrentRunLoop } from '@ember/runloop'; import { destroy } from '@glimmer/destroyable'; import { DEBUG } from '@glimmer/env'; +import type { CurriedComponent } from '@glimmer/interfaces'; import type { Bounds, Cursor, @@ -21,7 +22,6 @@ import type { EvaluationContext, } from '@glimmer/interfaces'; -import { CurriedType } from '@glimmer/vm'; import type { Nullable } from '@ember/-internals/utility-types'; import { programCompilationContext } from '@glimmer/opcode-compiler'; import { artifacts, RuntimeOpImpl } from '@glimmer/program'; @@ -372,7 +372,7 @@ export class Renderer { let definition = createRootOutlet(view); this._appendDefinition( view, - curry(CurriedType.Component, definition, view.owner, null, true), + curry(0 as CurriedComponent, definition, view.owner, null, true), target ); } @@ -381,7 +381,7 @@ export class Renderer { let definition = new RootComponentDefinition(view); this._appendDefinition( view, - curry(CurriedType.Component, definition, this._owner, null, true), + curry(0 as CurriedComponent, definition, this._owner, null, true), target ); } diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts index debf7a97eb9..f34c03b779d 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts @@ -1,8 +1,7 @@ import type { InternalOwner } from '@ember/-internals/owner'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import type { CapturedArguments, DynamicScope } from '@glimmer/interfaces'; -import { CurriedType } from '@glimmer/vm'; +import type { CapturedArguments, DynamicScope, CurriedComponent } from '@glimmer/interfaces'; import type { Reference } from '@glimmer/reference'; import { childRefFromParts, @@ -94,7 +93,7 @@ export const outletHelper = internalHelper( let args = createCapturedArgs(named, EMPTY_POSITIONAL); definition = curry( - CurriedType.Component, + 0 as CurriedComponent, new OutletComponentDefinition(state), outletState?.render?.owner ?? owner, args,