ember-source 5.6.0-alpha.2 → 5.6.0-alpha.4

package/dist/header/license.js

@@ -5,5 +5,5 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   5.6.0-alpha.2
+ * @version   5.6.0-alpha.4
  */

package/dist/packages/@ember/-internals/glimmer/index.js

@@ -3,8 +3,8 @@ export { templateFactory as template, templateCacheCounters } from '@glimmer/opc
 import { hasDOM } from '@ember/-internals/browser-environment';
 import { assert, warn, debugFreeze, inspect, deprecate } from '@ember/debug';
 import { action as action$1 } from '@ember/object';
-import { valueForRef, isConstRef, createConstRef, isUpdatableRef, updateRef, createComputeRef, createPrimitiveRef, childRefFor, childRefFromParts, isInvokableRef, createUnboundRef, createInvokableRef, createReadOnlyRef, createDebugAliasRef, UNDEFINED_REFERENCE } from '@glimmer/reference';
-import { untrack, createCache, consumeTag, tagFor, getValue, valueForTag, beginUntrackFrame, endUntrackFrame, beginTrackFrame, endTrackFrame, validateTag, createTag, dirtyTag, CONSTANT_TAG, isTracking, setTrackingTransactionEnv, createUpdatableTag, CURRENT_TAG } from '@glimmer/validator';
+import { valueForRef, isConstRef, createConstRef, isUpdatableRef, updateRef, createPrimitiveRef, childRefFor, createComputeRef, childRefFromParts, isInvokableRef, createUnboundRef, createInvokableRef, createReadOnlyRef, createDebugAliasRef, UNDEFINED_REFERENCE } from '@glimmer/reference';
+import { untrack, createCache, consumeTag, tagFor, getValue, valueForTag, beginUntrackFrame, endUntrackFrame, beginTrackFrame, endTrackFrame, validateTag, createTag, dirtyTag, CONSTANT_TAG, isTracking, debug, createUpdatableTag, CURRENT_TAG } from '@glimmer/validator';
 import { tracked, get, PROPERTY_DID_CHANGE, tagForObject, objectAt, tagForProperty, _getProp, _setProp, set } from '@ember/-internals/metal';
 import { setOwner, getOwner, isFactory } from '@ember/-internals/owner';
 import { guidFor, enumerableSymbol, getDebugName, isProxy, isObject, uuid } from '@ember/-internals/utils';
@@ -16,16 +16,17 @@ import { flaggedInstrument, _instrumentStart } from '@ember/instrumentation';
 import { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { TargetActionSupport, _contentFor } from '@ember/-internals/runtime';
-import { reifyPositional, normalizeProperty, EMPTY_ARGS, createCapturedArgs, EMPTY_POSITIONAL, curry, templateOnlyComponent, TEMPLATE_ONLY_COMPONENT_MANAGER, hash, array, concat, fn, get as get$1, on, clientBuilder, runtimeContext, DOMTreeConstruction, DOMChanges, inTransaction, renderMain, rehydrationBuilder } from '@glimmer/runtime';
+import { reifyPositional, normalizeProperty, EMPTY_ARGS, createCapturedArgs, EMPTY_POSITIONAL, curry, templateOnlyComponent, TEMPLATE_ONLY_COMPONENT_MANAGER, hash, array, concat, fn, get as get$1, on, runtimeContext, DOMTreeConstruction, DOMChanges, clientBuilder, inTransaction, renderMain, rehydrationBuilder } from '@glimmer/runtime';
 export { DOMChanges, DOMTreeConstruction, isSerializationFirstNode } from '@glimmer/runtime';
-import { _WeakSet, unwrapTemplate, EMPTY_ARRAY as EMPTY_ARRAY$1, dict } from '@glimmer/util';
+import { unwrapTemplate, EMPTY_ARRAY as EMPTY_ARRAY$1, dict } from '@glimmer/util';
 import { dasherize } from '@ember/-internals/string';
 import { registerDestructor, associateDestroyableChild, destroy } from '@glimmer/destroyable';
 import { join, _backburner, schedule, _getCurrentRunLoop } from '@ember/runloop';
 import { FrameworkObject } from '@ember/object/-internals';
 import { getFactoryFor, privatize } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
-import { artifacts } from '@glimmer/program';
+import { CurriedType } from '@glimmer/vm';
+import { artifacts, RuntimeOpImpl } from '@glimmer/program';
 import RSVP from 'rsvp';
 import { NodeDOMTreeConstruction, serializeBuilder } from '@glimmer/node';
 export { NodeDOMTreeConstruction } from '@glimmer/node';
@@ -43,13 +44,13 @@ var RootTemplate = templateFactory({
 });
 
 var InputTemplate = templateFactory({
-  "id": "OGSIkgXP",
-  "block": "[[[11,\"input\"],[16,1,[30,0,[\"id\"]]],[16,0,[30,0,[\"class\"]]],[17,1],[16,4,[30,0,[\"type\"]]],[16,\"checked\",[30,0,[\"checked\"]]],[16,2,[30,0,[\"value\"]]],[4,[38,0],[\"change\",[30,0,[\"change\"]]],null],[4,[38,0],[\"input\",[30,0,[\"input\"]]],null],[4,[38,0],[\"keyup\",[30,0,[\"keyUp\"]]],null],[4,[38,0],[\"paste\",[30,0,[\"valueDidChange\"]]],null],[4,[38,0],[\"cut\",[30,0,[\"valueDidChange\"]]],null],[12],[13]],[\"&attrs\"],false,[\"on\"]]",
+  "id": "ym/FeIbm",
+  "block": "[[[11,\"input\"],[16,1,[30,0,[\"id\"]]],[16,0,[30,0,[\"class\"]]],[17,1],[16,4,[30,0,[\"type\"]]],[16,\"checked\",[30,0,[\"checked\"]]],[16,2,[30,0,[\"value\"]]],[4,[38,1],[\"change\",[30,0,[\"change\"]]],null],[4,[38,1],[\"input\",[30,0,[\"input\"]]],null],[4,[38,1],[\"keyup\",[30,0,[\"keyUp\"]]],null],[4,[38,1],[\"paste\",[30,0,[\"valueDidChange\"]]],null],[4,[38,1],[\"cut\",[30,0,[\"valueDidChange\"]]],null],[12],[13]],[\"&attrs\"],false,[\"input\",\"on\"]]",
   "moduleName": "packages/@ember/-internals/glimmer/lib/templates/input.hbs",
   "isStrictMode": false
 });
 
-function NOOP() {}
+function NOOP$2() {}
 class InternalComponent {
   // Override this
   static toString() {
@@ -102,7 +103,7 @@ class InternalComponent {
       assert(`The \`@${name}\` argument to the <${this.constructor}> component must be a function`, typeof listener === 'function');
       return listener;
     } else {
-      return NOOP;
+      return NOOP$2;
     }
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -137,7 +138,7 @@ function deopaquify(opaque) {
   assert(`[BUG] Invalid internal component constructor: ${opaque}`, constructor);
   return constructor;
 }
-const CAPABILITIES = {
+const CAPABILITIES$2 = {
   dynamicLayout: false,
   dynamicTag: false,
   prepareArgs: false,
@@ -154,7 +155,7 @@ const CAPABILITIES = {
 };
 class InternalManager {
   getCapabilities() {
-    return CAPABILITIES;
+    return CAPABILITIES$2;
   }
   create(owner, definition, args, _env, _dynamicScope, caller) {
     assert('caller must be const', isConstRef(caller));
@@ -179,7 +180,7 @@ class InternalManager {
 }
 const INTERNAL_COMPONENT_MANAGER = new InternalManager();
 
-var __decorate = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+var __decorate$3 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
   var c = arguments.length,
     r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
     d;
@@ -219,7 +220,7 @@ class LocalValue {
     this.value = value;
   }
 }
-__decorate([tracked], LocalValue.prototype, "value", void 0);
+__decorate$3([tracked], LocalValue.prototype, "value", void 0);
 class UpstreamValue {
   constructor(reference) {
     this.reference = reference;
@@ -313,10 +314,10 @@ class AbstractInput extends InternalComponent {
     return virtualEvents.indexOf(name) !== -1;
   }
 }
-__decorate([action$1], AbstractInput.prototype, "valueDidChange", null);
-__decorate([action$1], AbstractInput.prototype, "keyUp", null);
+__decorate$3([action$1], AbstractInput.prototype, "valueDidChange", null);
+__decorate$3([action$1], AbstractInput.prototype, "keyUp", null);
 
-var __decorate$1 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+var __decorate$2 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
   var c = arguments.length,
     r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
     d;
@@ -532,19 +533,19 @@ class _Input extends AbstractInput {
     return supportedArguments.indexOf(name) !== -1 || super.isSupportedArgument(name);
   }
 }
-__decorate$1([action$1], _Input.prototype, "change", null);
-__decorate$1([action$1], _Input.prototype, "input", null);
-__decorate$1([action$1], _Input.prototype, "checkedDidChange", null);
+__decorate$2([action$1], _Input.prototype, "change", null);
+__decorate$2([action$1], _Input.prototype, "input", null);
+__decorate$2([action$1], _Input.prototype, "checkedDidChange", null);
 const Input = opaquify(_Input, InputTemplate);
 
 var LinkToTemplate = templateFactory({
-  "id": "CVwkBtGh",
-  "block": "[[[11,3],[16,1,[30,0,[\"id\"]]],[16,0,[30,0,[\"class\"]]],[16,\"role\",[30,0,[\"role\"]]],[16,\"title\",[30,0,[\"title\"]]],[16,\"rel\",[30,0,[\"rel\"]]],[16,\"tabindex\",[30,0,[\"tabindex\"]]],[16,\"target\",[30,0,[\"target\"]]],[17,1],[16,6,[30,0,[\"href\"]]],[4,[38,0],[\"click\",[30,0,[\"click\"]]],null],[12],[18,2,null],[13]],[\"&attrs\",\"&default\"],false,[\"on\",\"yield\"]]",
+  "id": "Mc9zTgGM",
+  "block": "[[[11,3],[16,1,[30,0,[\"id\"]]],[16,0,[30,0,[\"class\"]]],[16,\"role\",[30,0,[\"role\"]]],[16,\"title\",[30,0,[\"title\"]]],[16,\"rel\",[30,0,[\"rel\"]]],[16,\"tabindex\",[30,0,[\"tabindex\"]]],[16,\"target\",[30,0,[\"target\"]]],[17,1],[16,6,[30,0,[\"href\"]]],[4,[38,1],[\"click\",[30,0,[\"click\"]]],null],[12],[18,2,null],[13]],[\"&attrs\",\"&default\"],false,[\"a\",\"on\",\"yield\"]]",
   "moduleName": "packages/@ember/-internals/glimmer/lib/templates/link-to.hbs",
   "isStrictMode": false
 });
 
-var __decorate$2 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+var __decorate$1 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
   var c = arguments.length,
     r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
     d;
@@ -1020,8 +1021,8 @@ class _LinkTo extends InternalComponent {
     return supportedArguments.indexOf(name) !== -1 || super.isSupportedArgument(name);
   }
 }
-__decorate$2([service('-routing')], _LinkTo.prototype, "routing", void 0);
-__decorate$2([action$1], _LinkTo.prototype, "click", null);
+__decorate$1([service('-routing')], _LinkTo.prototype, "routing", void 0);
+__decorate$1([action$1], _LinkTo.prototype, "click", null);
 let {
   prototype
 } = _LinkTo;
@@ -1108,13 +1109,13 @@ let descriptorFor = (target, property) => {
 const LinkTo = opaquify(_LinkTo, LinkToTemplate);
 
 var TextareaTemplate = templateFactory({
-  "id": "OpzctQXz",
-  "block": "[[[11,\"textarea\"],[16,1,[30,0,[\"id\"]]],[16,0,[30,0,[\"class\"]]],[17,1],[16,2,[30,0,[\"value\"]]],[4,[38,0],[\"change\",[30,0,[\"change\"]]],null],[4,[38,0],[\"input\",[30,0,[\"input\"]]],null],[4,[38,0],[\"keyup\",[30,0,[\"keyUp\"]]],null],[4,[38,0],[\"paste\",[30,0,[\"valueDidChange\"]]],null],[4,[38,0],[\"cut\",[30,0,[\"valueDidChange\"]]],null],[12],[13]],[\"&attrs\"],false,[\"on\"]]",
+  "id": "q3u1N7CF",
+  "block": "[[[11,\"textarea\"],[16,1,[30,0,[\"id\"]]],[16,0,[30,0,[\"class\"]]],[17,1],[16,2,[30,0,[\"value\"]]],[4,[38,1],[\"change\",[30,0,[\"change\"]]],null],[4,[38,1],[\"input\",[30,0,[\"input\"]]],null],[4,[38,1],[\"keyup\",[30,0,[\"keyUp\"]]],null],[4,[38,1],[\"paste\",[30,0,[\"valueDidChange\"]]],null],[4,[38,1],[\"cut\",[30,0,[\"valueDidChange\"]]],null],[12],[13]],[\"&attrs\"],false,[\"textarea\",\"on\"]]",
   "moduleName": "packages/@ember/-internals/glimmer/lib/templates/textarea.hbs",
   "isStrictMode": false
 });
 
-var __decorate$3 = undefined && undefined.__decorate || function (decorators, target, key, desc) {
+var __decorate = undefined && undefined.__decorate || function (decorators, target, key, desc) {
   var c = arguments.length,
     r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
     d;
@@ -1271,8 +1272,8 @@ class _Textarea extends AbstractInput {
     return supportedArguments.indexOf(name) !== -1 || super.isSupportedArgument(name);
   }
 }
-__decorate$3([action$1], _Textarea.prototype, "change", null);
-__decorate$3([action$1], _Textarea.prototype, "input", null);
+__decorate([action$1], _Textarea.prototype, "change", null);
+__decorate([action$1], _Textarea.prototype, "input", null);
 const Textarea = opaquify(_Textarea, TextareaTemplate);
 
 function isTemplateFactory(template) {
@@ -1418,7 +1419,7 @@ function internalHelper(helper) {
 /**
 @module ember
 */
-const ACTIONS = new _WeakSet();
+const ACTIONS = new WeakSet();
 /**
   The `{{action}}` helper provides a way to pass triggers for behavior (usually
   just a function) between components, and into components from controllers.
@@ -1700,12 +1701,19 @@ var action = internalHelper(args => {
   if (isInvokableRef(action)) {
     fn = makeClosureAction(action, action, invokeRef, processArgs, debugKey);
   } else {
-    fn = makeDynamicClosureAction(valueForRef(context), target, action, processArgs, debugKey);
+    fn = makeDynamicClosureAction(valueForRef(context),
+    // SAFETY: glimmer-vm should expose narrowing utilities for references
+    //         as is, `target` is still `Reference<unknown>`.
+    //         however, we never even tried to narrow `target`, so this is potentially risky code.
+    target,
+    // SAFETY: glimmer-vm should expose narrowing utilities for references
+    //         as is, `action` is still `Reference<unknown>`
+    action, processArgs, debugKey);
   }
   ACTIONS.add(fn);
   return createUnboundRef(fn, '(result of an `action` helper)');
 });
-function NOOP$2(args) {
+function NOOP(args) {
   return args;
 }
 function makeArgsProcessor(valuePathRef, actionArgsRef) {
@@ -1730,16 +1738,17 @@ function makeArgsProcessor(valuePathRef, actionArgsRef) {
       return readValue(mergeArgs(args));
     };
   } else {
-    return mergeArgs || readValue || NOOP$2;
+    return mergeArgs || readValue || NOOP;
   }
 }
 function makeDynamicClosureAction(context, targetRef, actionRef, processArgs, debugKey) {
+  const action = valueForRef(actionRef);
   // We don't allow undefined/null values, so this creates a throw-away action to trigger the assertions
   if (DEBUG) {
-    makeClosureAction(context, valueForRef(targetRef), valueForRef(actionRef), processArgs, debugKey);
+    makeClosureAction(context, valueForRef(targetRef), action, processArgs, debugKey);
   }
   return (...args) => {
-    return makeClosureAction(context, valueForRef(targetRef), valueForRef(actionRef), processArgs, debugKey)(...args);
+    return makeClosureAction(context, valueForRef(targetRef), action, processArgs, debugKey)(...args);
   };
 }
 function makeClosureAction(context, target, action, processArgs, debugKey) {
@@ -1747,9 +1756,12 @@ function makeClosureAction(context, target, action, processArgs, debugKey) {
   let fn;
   assert(`Action passed is null or undefined in (action) from ${target}.`, action !== undefined && action !== null);
   if (typeof action === 'string') {
+    assert('target must be an object', target !== null && typeof target === 'object');
     self = target;
-    fn = target.actions && target.actions[action];
-    assert(`An action named '${action}' was not found in ${target}`, Boolean(fn));
+    let value = target.actions?.[action];
+    assert(`An action named '${action}' was not found in ${target}`, Boolean(value));
+    assert(`An action named '${action}' was found in ${target}, but is not a function`, typeof value === 'function');
+    fn = value;
   } else if (typeof action === 'function') {
     self = context;
     fn = action;
@@ -2386,7 +2398,7 @@ Helper[_a] = true;
 // a bad idea and probably not something we want. We've moved that definition
 // here, but it should definitely be reviewed and probably removed.
 /** @deprecated */
-Helper.helper = helper;
+Helper.helper = helper$1;
 /* eslint-enable import/export */
 function isClassicHelper(obj) {
   return obj[IS_CLASSIC_HELPER] === true;
@@ -2474,7 +2486,7 @@ class SimpleClassicHelperManager {
 }
 const SIMPLE_CLASSIC_HELPER_MANAGER = new SimpleClassicHelperManager();
 setHelperManager(() => SIMPLE_CLASSIC_HELPER_MANAGER, Wrapper.prototype);
-function helper(helperFn
+function helper$1(helperFn
 // At the implementation site, we don't care about the actual underlying type
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ) {
@@ -2661,9 +2673,10 @@ function isHTMLSafe(str) {
   return str !== null && typeof str === 'object' && 'toHTML' in str && typeof str.toHTML === 'function';
 }
 
-function instrumentationPayload(def) {
+function instrumentationPayload$1(def) {
+  // "main" used to be the outlet name, keeping it around for compatibility
   return {
-    object: `${def.name}:${def.outlet}`
+    object: `${def.name}:main`
   };
 }
 const CAPABILITIES$1 = {
@@ -2688,12 +2701,10 @@ class OutletComponentManager {
     dynamicScope.set('outletState', currentStateRef);
     let state = {
       self: createConstRef(definition.controller, 'this'),
-      finalize: _instrumentStart('render.outlet', instrumentationPayload, definition)
+      finalize: _instrumentStart('render.outlet', instrumentationPayload$1, definition)
     };
     if (env.debugRenderTree !== undefined) {
-      state.outlet = {
-        name: definition.outlet
-      };
+      state.outletBucket = {};
       let parentState = valueForRef(parentStateRef);
       let parentOwner = parentState && parentState.render && parentState.render.owner;
       let currentOwner = valueForRef(currentStateRef).render.owner;
@@ -2717,16 +2728,16 @@ class OutletComponentManager {
   }
   getDebugCustomRenderTree(definition, state, args) {
     let nodes = [];
-    if (state.outlet) {
-      nodes.push({
-        bucket: state.outlet,
-        type: 'outlet',
-        name: state.outlet.name,
-        args: EMPTY_ARGS,
-        instance: undefined,
-        template: undefined
-      });
-    }
+    assert('[BUG] outletBucket must be set', state.outletBucket);
+    nodes.push({
+      bucket: state.outletBucket,
+      type: 'outlet',
+      // "main" used to be the outlet name, keeping it around for compatibility
+      name: 'main',
+      args: EMPTY_ARGS,
+      instance: undefined,
+      template: undefined
+    });
     if (state.engineBucket) {
       nodes.push({
         bucket: state.engineBucket,
@@ -3330,7 +3341,7 @@ setGlobalContext({
   }
 });
 if (DEBUG) {
-  setTrackingTransactionEnv?.({
+  debug?.setTrackingTransactionEnv?.({
     debugMessage(obj, keyName) {
       let dirtyString = keyName ? `\`${keyName}\` on \`${getDebugName?.(obj)}\`` : `\`${getDebugName?.(obj)}\``;
       return `You attempted to update ${dirtyString}, but it had already been used previously in the same computation.  Attempting to update a value after using it in a computation can cause logical errors, infinite revalidation bugs, and performance issues, and is not supported.`;
@@ -3392,9 +3403,9 @@ var disallowDynamicResolution = internalHelper(({
   });
 });
 
-let helper$1;
+let helper;
 if (DEBUG) {
-  helper$1 = args => {
+  helper = args => {
     const inner = args.positional[0];
     assert('expected at least one positional arg', inner);
     return createComputeRef(() => {
@@ -3404,13 +3415,13 @@ if (DEBUG) {
     });
   };
 } else {
-  helper$1 = args => {
+  helper = args => {
     let arg = args.positional[0];
     assert('expected at least one positional arg', arg);
     return arg;
   };
 }
-var inElementNullCheckHelper = internalHelper(helper$1);
+var inElementNullCheckHelper = internalHelper(helper);
 
 var normalizeClassHelper = internalHelper(({
   positional
@@ -3735,6 +3746,11 @@ var unbound = internalHelper(({
 @module ember
 */
 var uniqueId = internalHelper(() => {
+  // SAFETY: glimmer-vm should change the signature of createUnboundRef to use a generic
+  //         so that the type param to `Reference<?>` can infer from the first argument.
+  //
+  // NOTE: constRef is an optimization so we don't let the VM create extra wrappers,
+  //       tracking frames, etc.
   return createConstRef(uniqueId$1(), 'unique-id');
 });
 // From https://gist.github.com/selfish/fef2c0ba6cdfe07af76e64cecd74888b
@@ -3961,7 +3977,7 @@ class ActionModifierManager {
 const ACTION_MODIFIER_MANAGER = new ActionModifierManager();
 var actionModifier = setInternalModifierManager(ACTION_MODIFIER_MANAGER, {});
 
-const CAPABILITIES$2 = {
+const CAPABILITIES = {
   dynamicLayout: true,
   dynamicTag: false,
   prepareArgs: false,
@@ -3982,7 +3998,7 @@ class MountManager {
     return unwrapTemplate(templateFactory(state.engine)).asLayout();
   }
   getCapabilities() {
-    return CAPABILITIES$2;
+    return CAPABILITIES;
   }
   getOwner(state) {
     return state.engine;
@@ -4084,7 +4100,7 @@ class MountDefinition {
     this.handle = -1;
     this.manager = MOUNT_MANAGER;
     this.compilable = null;
-    this.capabilities = capabilityFlagsFrom(CAPABILITIES$2);
+    this.capabilities = capabilityFlagsFrom(CAPABILITIES);
     this.state = {
       name: resolvedName
     };
@@ -4151,7 +4167,7 @@ const mountHelper = internalHelper((args, owner) => {
       }
       assert(`You used \`{{mount '${name}'}}\`, but the engine '${name}' can not be found.`, owner.hasRegistration(`engine:${name}`));
       lastName = name;
-      lastDef = curry(0 /* CurriedType.Component */, new MountDefinition(name), owner, captured, true);
+      lastDef = curry(CurriedType.Component, new MountDefinition(name), owner, captured, true);
       return lastDef;
     } else {
       assert(`Invalid engine name '${name}' specified, engine name must be either a string, null or undefined.`, name === null || name === undefined);
@@ -4191,8 +4207,7 @@ const outletHelper = internalHelper((_args, owner, scope) => {
   assert('Expected dynamic scope to be present. You may have attempted to use the {{outlet}} keyword dynamically. This keyword cannot be used dynamically.', scope);
   let outletRef = createComputeRef(() => {
     let state = valueForRef(scope.get('outletState'));
-    let outlets = state !== undefined ? state.outlets : undefined;
-    return outlets !== undefined ? outlets['main'] : undefined;
+    return state?.outlets?.main;
   });
   let lastState = null;
   let definition = null;
@@ -4223,7 +4238,7 @@ const outletHelper = internalHelper((_args, owner, scope) => {
           named['model'] = createDebugAliasRef('@model', named['model']);
         }
         let args = createCapturedArgs(named, EMPTY_POSITIONAL);
-        definition = curry(0 /* CurriedType.Component */, new OutletComponentDefinition(state), outletState?.render?.owner ?? owner, args, true);
+        definition = curry(CurriedType.Component, new OutletComponentDefinition(state), outletState?.render?.owner ?? owner, args, true);
       } else {
         definition = null;
       }
@@ -4237,15 +4252,28 @@ function stateFor(ref, outlet) {
   if (render === undefined) return null;
   let template = render.template;
   if (template === undefined) return null;
-  // this guard can be removed once @ember/test-helpers@1.6.0 has "aged out"
-  // and is no longer considered supported
   if (isTemplateFactory(template)) {
     template = template(render.owner);
+    if (DEBUG) {
+      let message = 'The `template` property of `OutletState` should be a ' + '`Template` rather than a `TemplateFactory`. This is known to be a ' + "problem in older versions of `@ember/test-helpers`. If you haven't " + 'done so already, try upgrading to the latest version.\n\n';
+      if (template.result === 'ok' && typeof template.moduleName === 'string') {
+        message += 'The offending template has a moduleName `' + template.moduleName + '`, which might be helpful for identifying ' + 'source of this issue.\n\n';
+      }
+      message += 'Please note that `OutletState` is a private API in Ember.js ' + "and not meant to be used outside of the framework's internal code.";
+      deprecate(message, false, {
+        id: 'outlet-state-template-factory',
+        until: '5.9.0',
+        for: 'ember-source',
+        since: {
+          available: '5.6.0',
+          enabled: '5.6.0'
+        }
+      });
+    }
   }
   return {
     ref,
     name: render.name,
-    outlet: render.outlet,
     template,
     controller: render.controller,
     model: render.model
@@ -4261,7 +4289,7 @@ function validate(state, lastState) {
   return state.template === lastState.template && state.controller === lastState.controller;
 }
 
-function instrumentationPayload$1(name) {
+function instrumentationPayload(name) {
   return {
     object: `component:${name}`
   };
@@ -4338,7 +4366,7 @@ const BUILTIN_MODIFIERS = {
   ...BUILTIN_KEYWORD_MODIFIERS,
   on
 };
-const CLASSIC_HELPER_MANAGER_ASSOCIATED = new _WeakSet();
+const CLASSIC_HELPER_MANAGER_ASSOCIATED = new WeakSet();
 class ResolverImpl {
   constructor() {
     this.componentDefinitionCache = new Map();
@@ -4415,7 +4443,7 @@ class ResolverImpl {
     if (template === null && pair.layout !== null) {
       template = pair.layout(owner);
     }
-    let finalizer = _instrumentStart('render.getComponentDefinition', instrumentationPayload$1, name);
+    let finalizer = _instrumentStart('render.getComponentDefinition', instrumentationPayload, name);
     let definition = null;
     if (pair.component === null) {
       if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
@@ -4452,8 +4480,10 @@ class ResolverImpl {
 }
 
 // We use the `InternalOwner` notion here because we actually need all of its
+// API for using with renderers (normally, it will be `EngineInstance`).
+// We use `getOwner` from our internal home for it rather than the narrower
+// public API for the same reason.
 const TOP_LEVEL_NAME = '-top-level';
-const TOP_LEVEL_OUTLET = 'main';
 class OutletView {
   static extend(injections) {
     return class extends OutletView {
@@ -4493,7 +4523,7 @@ class OutletView {
       render: {
         owner: owner,
         into: undefined,
-        outlet: TOP_LEVEL_OUTLET,
+        outlet: 'main',
         name: TOP_LEVEL_NAME,
         controller: undefined,
         model: undefined,
@@ -4510,7 +4540,6 @@ class OutletView {
     this.state = {
       ref,
       name: TOP_LEVEL_NAME,
-      outlet: TOP_LEVEL_OUTLET,
       template,
       controller: undefined,
       model: undefined
@@ -4725,7 +4754,7 @@ class Renderer {
     // resolver is exposed for tests
     let resolver = this._runtimeResolver = new ResolverImpl();
     let sharedArtifacts = artifacts();
-    this._context = programCompilationContext(sharedArtifacts, resolver);
+    this._context = programCompilationContext(sharedArtifacts, resolver, heap => new RuntimeOpImpl(heap));
     let runtimeEnvironmentDelegate = new EmberEnvironmentDelegate(owner, env.isInteractive);
     this._runtime = runtimeContext({
       appendOperations: env.hasDOM ? new DOMTreeConstruction(document) : new NodeDOMTreeConstruction(document),
@@ -4742,11 +4771,11 @@ class Renderer {
   // renderer HOOKS
   appendOutletView(view, target) {
     let definition = createRootOutlet(view);
-    this._appendDefinition(view, curry(0 /* CurriedType.Component */, definition, view.owner, null, true), target);
+    this._appendDefinition(view, curry(CurriedType.Component, definition, view.owner, null, true), target);
   }
   appendTo(view, target) {
     let definition = new RootComponentDefinition(view);
-    this._appendDefinition(view, curry(0 /* CurriedType.Component */, definition, this._owner, null, true), target);
+    this._appendDefinition(view, curry(CurriedType.Component, definition, this._owner, null, true), target);
   }
   _appendDefinition(root, definition, target) {
     let self = createConstRef(definition, 'this');
@@ -5002,4 +5031,4 @@ function setComponentManager(manager, obj) {
 let componentCapabilities = componentCapabilities$1;
 let modifierCapabilities = modifierCapabilities$1;
 
-export { Component, Helper, Input, LinkTo, OutletView, Renderer, RootTemplate, SafeString, Textarea, _resetRenderers, componentCapabilities, escapeExpression, getTemplate, getTemplates, hasTemplate, helper, htmlSafe, isHTMLSafe, modifierCapabilities, renderSettled, setComponentManager, setTemplate, setTemplates, setupApplicationRegistry, setupEngineRegistry, uniqueId$1 as uniqueId };
+export { Component, Helper, Input, LinkTo, OutletView, Renderer, RootTemplate, SafeString, Textarea, _resetRenderers, componentCapabilities, escapeExpression, getTemplate, getTemplates, hasTemplate, helper$1 as helper, htmlSafe, isHTMLSafe, modifierCapabilities, renderSettled, setComponentManager, setTemplate, setTemplates, setupApplicationRegistry, setupEngineRegistry, uniqueId$1 as uniqueId };

package/dist/packages/@ember/-internals/metal/index.js

@@ -5,7 +5,6 @@ import { registerDestructor, isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
 import { tagMetaFor, valueForTag, CURRENT_TAG, validateTag, tagFor, CONSTANT_TAG, dirtyTagFor, combine, createUpdatableTag, updateTag, untrack, ALLOW_CYCLES, consumeTag, track, isTracking, trackedData, createCache, getValue } from '@glimmer/validator';
 export { createCache, getValue, isConst } from '@glimmer/validator';
-import { _WeakSet } from '@glimmer/util';
 import { ENV, context } from '@ember/-internals/environment';
 import { schedule } from '@ember/runloop';
 import { getCustomTagFor } from '@glimmer/manager';
@@ -598,7 +597,7 @@ function removeArrayObserver(array, target, opts) {
   return arrayObserversHelper(array, target, opts, removeListener);
 }
 
-const CHAIN_PASS_THROUGH = new _WeakSet();
+const CHAIN_PASS_THROUGH = new WeakSet();
 function finishLazyChains(meta, key, value) {
   let lazyTags = meta.readableLazyChainsFor(key);
   if (lazyTags === undefined) {
@@ -775,7 +774,7 @@ class ComputedDescriptor {
 }
 let COMPUTED_GETTERS;
 if (DEBUG) {
-  COMPUTED_GETTERS = new _WeakSet();
+  COMPUTED_GETTERS = new WeakSet();
 }
 function DESCRIPTOR_GETTER_FUNCTION(name, descriptor) {
   function getter() {
@@ -793,7 +792,7 @@ function DESCRIPTOR_SETTER_FUNCTION(name, descriptor) {
   COMPUTED_SETTERS.add(set);
   return set;
 }
-const COMPUTED_SETTERS = new _WeakSet();
+const COMPUTED_SETTERS = new WeakSet();
 function makeComputedDecorator(desc, DecoratorClass) {
   let decorator = function COMPUTED_DECORATOR(target, key, propertyDesc, maybeMeta, isClassicDecorator) {
     assert(`Only one computed property decorator can be applied to a class field or accessor, but '${key}' was decorated twice. You may have added the decorator to both a getter and setter, which is unnecessary.`, isClassicDecorator || !propertyDesc || !propertyDesc.get || !COMPUTED_GETTERS.has(propertyDesc.get));
@@ -2058,6 +2057,8 @@ class TrackedDescriptor {
 }
 
 // NOTE: copied from: https://github.com/glimmerjs/glimmer.js/pull/358
+// Both glimmerjs/glimmer.js and emberjs/ember.js have the exact same implementation
+// of @cached, so any changes made to one should also be made to the other
 /**
  * @decorator
  *

package/dist/packages/@ember/-internals/utils/index.js

@@ -1,5 +1,4 @@
 import { DEBUG } from '@glimmer/env';
-import { _WeakSet } from '@glimmer/util';
 import { assert } from '@ember/debug';
 
 /**
@@ -306,7 +305,7 @@ function setListeners(func, listeners) {
   let meta = createObserverListenerMetaFor(func);
   meta.listeners = listeners;
 }
-const IS_WRAPPED_FUNCTION_SET = new _WeakSet();
+const IS_WRAPPED_FUNCTION_SET = new WeakSet();
 /**
   Wraps the passed function so that `this._super` will point to the superFunc
   when the function is invoked. This is the primitive we use to implement
@@ -424,7 +423,7 @@ function toString(obj) {
   return objectToString.call(obj);
 }
 
-const PROXIES = new _WeakSet();
+const PROXIES = new WeakSet();
 function isProxy(value) {
   if (isObject(value)) {
     return PROXIES.has(value);
@@ -485,7 +484,7 @@ function isPositiveInt(num) {
   return num >= 0 && num % 1 === 0;
 }
 if (DEBUG) {
-  let SEEN_TAGS = new _WeakSet();
+  let SEEN_TAGS = new WeakSet();
   let MANDATORY_SETTERS = new WeakMap();
   let propertyIsEnumerable = function (obj, key) {
     return Object.prototype.propertyIsEnumerable.call(obj, key);

package/dist/packages/@ember/array/-internals.js

@@ -1,5 +1,4 @@
-import { _WeakSet } from '@glimmer/util';
-const EMBER_ARRAYS = new _WeakSet();
+const EMBER_ARRAYS = new WeakSet();
 export function setEmberArray(obj) {
   EMBER_ARRAYS.add(obj);
 }

package/dist/packages/@ember/debug/lib/inspect.js

@@ -1,4 +1,3 @@
-import { _WeakSet as WeakSet } from '@glimmer/util';
 import { assert } from '@ember/debug';
 const {
   toString: objectToString

package/dist/packages/@ember/object/core.js

@@ -11,7 +11,6 @@ import { ActionHandler } from '@ember/-internals/runtime';
 import { makeArray } from '@ember/array';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { _WeakSet as WeakSet } from '@glimmer/util';
 import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer/destroyable';
 import { OWNER } from '@glimmer/owner';
 function hasSetUnknownProperty(val) {

package/dist/packages/@ember/object/mixin.js

@@ -6,7 +6,6 @@ import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { guidFor, observerListenerMetaFor, ROOT, wrap } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { _WeakSet } from '@glimmer/util';
 import { isClassicDecorator } from '@ember/-internals/metal';
 import { ComputedProperty, descriptorForDecorator, makeComputedDecorator, nativeDescDecorator, setUnprocessedMixins, addObserver, removeObserver, revalidateObservers, defineDecorator, defineValue } from '@ember/-internals/metal';
 import { addListener, removeListener } from '@ember/object/events';
@@ -295,7 +294,7 @@ export function mixin(obj, ...args) {
   applyMixin(obj, args);
   return obj;
 }
-const MIXINS = new _WeakSet();
+const MIXINS = new WeakSet();
 /**
   The `Mixin` class allows you to create mixins, whose properties can be
   added to other classes. For instance,