diff --git a/.npmrc b/.npmrc
new file mode 100644
index 00000000000..3f38641bd1a
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1,5 @@
+# super strict mode
+auto-install-peers=false
+resolve-peers-from-workspace-root=false
+
+
diff --git a/lib/index.js b/lib/index.js
index 5a1a043dfb8..36ac10b24c3 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -8,7 +8,7 @@ const buildDebugMacroPlugin = require('./build-debug-macro-plugin');
 const buildStripClassCallcheckPlugin = require('./build-strip-class-callcheck-plugin');
 const injectBabelHelpers = require('./transforms/inject-babel-helpers').injectBabelHelpers;
 const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:addon');
-const vmBabelPlugins = require('@glimmer/vm-babel-plugins');
+const { default: vmBabelPlugins } = require('@glimmer/vm-babel-plugins');
 const Overrides = require('./overrides');
 const SilentError = require('silent-error');
 const SupportedBrowsers = require('./browsers');
@@ -156,10 +156,6 @@ module.exports = {
           babelHelperPlugin,
           buildDebugMacroPlugin(!isProduction),
           ...vmBabelPlugins({ isDebug: !isProduction }),
-          [
-            require.resolve('@babel/plugin-transform-block-scoping'),
-            { throwIfClosureRequired: true },
-          ],
         ],
       }),
     };
diff --git a/package.json b/package.json
index 3d0044223e3..a4560658016 100644
--- a/package.json
+++ b/package.json
@@ -55,25 +55,25 @@
   },
   "dependencies": {
     "@babel/helper-module-imports": "^7.16.7",
-    "@babel/plugin-transform-block-scoping": "^7.22.5",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/compiler": "0.84.3",
+    "@glimmer/compiler": "0.85.13",
     "@glimmer/component": "^1.1.2",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.84.3",
-    "@glimmer/interfaces": "0.84.3",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/node": "0.84.3",
-    "@glimmer/opcode-compiler": "0.84.3",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/program": "0.84.3",
-    "@glimmer/reference": "0.84.3",
-    "@glimmer/runtime": "0.84.3",
-    "@glimmer/syntax": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
-    "@glimmer/vm-babel-plugins": "0.84.3",
+    "@glimmer/global-context": "0.85.13",
+    "@glimmer/interfaces": "0.85.13",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/node": "0.85.13",
+    "@glimmer/opcode-compiler": "0.85.13",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/program": "0.85.13",
+    "@glimmer/reference": "0.85.13",
+    "@glimmer/runtime": "0.85.13",
+    "@glimmer/syntax": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
+    "@glimmer/vm": "0.85.13",
+    "@glimmer/vm-babel-plugins": "0.85.13",
     "@simple-dom/interface": "^1.4.0",
     "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
@@ -173,6 +173,11 @@
   "resolutions": {
     "socket.io": "^4.7.0"
   },
+  "pnpm": {
+    "overrides": {
+      "rollup": "^4.2.0"
+    }
+  },
   "peerDependencies": {
     "@glimmer/component": "^1.1.2"
   },
@@ -194,6 +199,6 @@
   },
   "volta": {
     "node": "16.20.0",
-    "pnpm": "8.7.6"
+    "pnpm": "8.10.0"
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index e29c7d176d4..23d004c28f5 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -6,6 +6,7 @@ import {
 } from '@ember/-internals/owner';
 import { enumerableSymbol, guidFor } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
+import type { Nullable } from '@ember/-internals/utility-types';
 import { assert, debugFreeze } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
@@ -17,7 +18,6 @@ import type {
   ElementOperations,
   Environment,
   InternalComponentCapabilities,
-  Option,
   PreparedArguments,
   TemplateFactory,
   VMArguments,
@@ -154,7 +154,7 @@ export default class CurlyComponentManager
     return this.templateFor(bucket.component);
   }
 
-  getTagName(state: ComponentStateBucket): Option<string> {
+  getTagName(state: ComponentStateBucket): Nullable<string> {
     let { component, hasWrappedElement } = state;
 
     if (!hasWrappedElement) {
@@ -168,7 +168,7 @@ export default class CurlyComponentManager
     return CURLY_CAPABILITIES;
   }
 
-  prepareArgs(ComponentClass: ComponentFactory, args: VMArguments): Option<PreparedArguments> {
+  prepareArgs(ComponentClass: ComponentFactory, args: VMArguments): Nullable<PreparedArguments> {
     if (args.named.has('__ARGS__')) {
       assert(
         '[BUG] cannot pass both __ARGS__ and positional arguments',
@@ -467,7 +467,7 @@ export default class CurlyComponentManager
     }
   }
 
-  getDestroyable(bucket: ComponentStateBucket): Option<Destroyable> {
+  getDestroyable(bucket: ComponentStateBucket): Nullable<Destroyable> {
     return bucket;
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index 8fad1b2f9d7..068d30c8fbf 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -10,7 +10,6 @@ import type {
   Destroyable,
   Environment,
   InternalComponentCapabilities,
-  Option,
   TemplateFactory,
   VMArguments,
   WithCreateInstance,
@@ -18,6 +17,7 @@ import type {
   WithDynamicLayout,
   WithSubOwner,
 } from '@glimmer/interfaces';
+import type { Nullable } from '@ember/-internals/utility-types';
 import { capabilityFlagsFrom } from '@glimmer/manager';
 import type { Reference } from '@glimmer/reference';
 import { createConstRef, valueForRef } from '@glimmer/reference';
@@ -149,7 +149,7 @@ class MountManager
     return self;
   }
 
-  getDestroyable(bucket: EngineState): Option<Destroyable> {
+  getDestroyable(bucket: EngineState): Nullable<Destroyable> {
     return bucket.engine;
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index f914687b421..39cf2cfd29c 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -8,18 +8,18 @@ import type {
   CapturedArguments,
   CompilableProgram,
   ComponentDefinition,
+  CapabilityMask,
   CustomRenderNode,
   Destroyable,
   Environment,
   InternalComponentCapabilities,
-  InternalComponentCapability,
-  Option,
   Template,
   VMArguments,
   WithCreateInstance,
   WithCustomDebugRenderTree,
   WithDynamicTagName,
 } from '@glimmer/interfaces';
+import type { Nullable } from '@ember/-internals/utility-types';
 import { capabilityFlagsFrom } from '@glimmer/manager';
 import type { Reference } from '@glimmer/reference';
 import { createConstRef, valueForRef } from '@glimmer/reference';
@@ -179,7 +179,7 @@ class OutletComponentManager
 
   didUpdateLayout() {}
 
-  getDestroyable(): Option<Destroyable> {
+  getDestroyable(): Nullable<Destroyable> {
     return null;
   }
 }
@@ -195,7 +195,7 @@ export class OutletComponentDefinition
 
   public resolvedName: string;
   public compilable: CompilableProgram;
-  public capabilities: InternalComponentCapability;
+  public capabilities: CapabilityMask;
 
   constructor(
     public state: OutletDefinitionState,
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
index 96039c6ef3f..00aca8f633c 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
@@ -6,10 +6,10 @@ import type {
   ComponentDefinition,
   Environment,
   InternalComponentCapabilities,
-  Option,
   Owner,
   VMArguments,
 } from '@glimmer/interfaces';
+import type { Nullable } from '@ember/-internals/utility-types';
 import { capabilityFlagsFrom } from '@glimmer/manager';
 import { CONSTANT_TAG, consumeTag } from '@glimmer/validator';
 import type Component from '../component';
@@ -32,7 +32,7 @@ class RootComponentManager extends CurlyComponentManager {
   create(
     _owner: Owner,
     _state: unknown,
-    _args: Option<VMArguments>,
+    _args: Nullable<VMArguments>,
     { isInteractive }: Environment,
     dynamicScope: DynamicScope
   ) {
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 97c119a10f2..f5110758a4e 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -8,7 +8,8 @@ import { flaggedInstrument } from '@ember/instrumentation';
 import { action } from '@ember/object';
 import { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
-import type { Maybe, Option } from '@glimmer/interfaces';
+import type { Maybe } from '@glimmer/interfaces';
+import type { Nullable } from '@ember/-internals/utility-types';
 import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
 import type { Transition } from 'router_js';
 import LinkToTemplate from '../templates/link-to';
@@ -31,7 +32,7 @@ function isPresent<T>(value: Maybe<T>): value is T {
 
 interface QueryParams {
   isQueryParams: true;
-  values: Option<{}>;
+  values: Nullable<{}>;
 }
 
 function isQueryParams(value: unknown): value is QueryParams {
@@ -473,7 +474,7 @@ class _LinkTo extends InternalComponent {
     return this.isActiveForState(this.routing.currentState as Maybe<RouterState>);
   }
 
-  private get willBeActive(): Option<boolean> {
+  private get willBeActive(): Nullable<boolean> {
     let current = this.routing.currentState;
     let target = this.routing.targetState;
 
@@ -585,7 +586,7 @@ class _LinkTo extends InternalComponent {
 
 let { prototype } = _LinkTo;
 
-let descriptorFor = (target: object, property: string): Option<PropertyDescriptor> => {
+let descriptorFor = (target: object, property: string): Nullable<PropertyDescriptor> => {
   if (target) {
     return (
       Object.getOwnPropertyDescriptor(target, property) ||
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 90c2f27ca88..ffa77980ad5 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -9,7 +9,7 @@ import { schedule, _backburner } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import setGlobalContext from '@glimmer/global-context';
 import type { EnvironmentDelegate } from '@glimmer/runtime';
-import { setTrackingTransactionEnv } from '@glimmer/validator';
+import { debug } from '@glimmer/validator';
 import toIterator from './utils/iterator';
 import { isHTMLSafe } from './utils/string';
 import toBool from './utils/to-bool';
@@ -92,7 +92,7 @@ setGlobalContext({
 });
 
 if (DEBUG) {
-  setTrackingTransactionEnv?.({
+  debug?.setTrackingTransactionEnv?.({
     debugMessage(obj, keyName) {
       let dirtyString = keyName
         ? `\`${keyName}\` on \`${getDebugName?.(obj)}\``
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index d803e5c98f2..8f2423972ab 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -10,10 +10,9 @@ import { DEBUG } from '@glimmer/env';
 import type { CapturedArguments } from '@glimmer/interfaces';
 import type { Reference } from '@glimmer/reference';
 import { createUnboundRef, isInvokableRef, updateRef, valueForRef } from '@glimmer/reference';
-import { _WeakSet } from '@glimmer/util';
 import { internalHelper } from './internal-helper';
 
-export const ACTIONS = new _WeakSet();
+export const ACTIONS = new WeakSet();
 
 /**
   The `{{action}}` helper provides a way to pass triggers for behavior (usually
@@ -299,7 +298,12 @@ export default internalHelper((args: CapturedArguments): Reference<Function> =>
   } else {
     fn = makeDynamicClosureAction(
       valueForRef(context) as object,
+      // 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
@@ -349,27 +353,23 @@ function makeArgsProcessor(valuePathRef: Reference | false, actionArgsRef: Refer
 
 function makeDynamicClosureAction(
   context: object,
-  targetRef: Reference<MaybeActionHandler>,
-  actionRef: Reference<string | AnyFn>,
+  targetRef: Reference<unknown>,
+  actionRef: Reference<unknown>,
   processArgs: (args: unknown[]) => unknown[],
   debugKey: string
 ) {
+  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: any[]) => {
     return makeClosureAction(
       context,
       valueForRef(targetRef),
-      valueForRef(actionRef),
+      action,
       processArgs,
       debugKey
     )(...args);
@@ -377,18 +377,18 @@ function makeDynamicClosureAction(
 }
 
 interface MaybeActionHandler {
-  actions?: Record<string, AnyFn>;
+  actions?: Record<string, Function>;
 }
 
 function makeClosureAction(
   context: object,
-  target: MaybeActionHandler,
-  action: string | AnyFn,
+  target: unknown,
+  action: unknown | null | undefined | string | Function,
   processArgs: (args: unknown[]) => unknown[],
   debugKey: string
 ) {
   let self: object;
-  let fn: AnyFn;
+  let fn: Function;
 
   assert(
     `Action passed is null or undefined in (action) from ${target}.`,
@@ -396,10 +396,15 @@ function makeClosureAction(
   );
 
   if (typeof action === 'string') {
+    assert('target must be an object', target !== null && typeof target === 'object');
     self = target;
-    fn = (target.actions && target.actions[action as string])!;
-
-    assert(`An action named '${action}' was not found in ${target}`, Boolean(fn));
+    let value = (target as { actions?: Record<string, unknown> }).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;
@@ -417,7 +422,7 @@ function makeClosureAction(
   return (...args: any[]) => {
     let payload = { target: self, args, label: '@glimmer/closure-action' };
     return flaggedInstrument('interaction.ember-action', payload, () => {
-      return join(self, fn, ...processArgs(args));
+      return join(self, fn as AnyFn, ...processArgs(args));
     });
   };
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
index 211f4192963..edf1d29eeab 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
@@ -30,7 +30,12 @@ import { createConstRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
 export default internalHelper((): Reference<string> => {
-  return createConstRef(uniqueId(), 'unique-id');
+  // 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(), 'unique-id') as Reference<string>;
 });
 
 // From https://gist.github.com/selfish/fef2c0ba6cdfe07af76e64cecd74888b
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 3b036cd9a2e..1c9c0e44469 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -16,15 +16,16 @@ import type {
   DynamicScope as GlimmerDynamicScope,
   ElementBuilder,
   Environment,
-  Option,
   RenderResult,
   RuntimeContext,
   Template,
   TemplateFactory,
 } from '@glimmer/interfaces';
-import { CurriedType } from '@glimmer/interfaces';
+
+import { CurriedType } from '@glimmer/vm';
+import type { Nullable } from '@ember/-internals/utility-types';
 import { programCompilationContext } from '@glimmer/opcode-compiler';
-import { artifacts } from '@glimmer/program';
+import { artifacts, RuntimeOpImpl } from '@glimmer/program';
 import type { Reference } from '@glimmer/reference';
 import { createConstRef, UNDEFINED_REFERENCE, valueForRef } from '@glimmer/reference';
 import type { CurriedValue } from '@glimmer/runtime';
@@ -54,7 +55,7 @@ import OutletView from './views/outlet';
 export type IBuilder = (env: Environment, cursor: Cursor) => ElementBuilder;
 
 export interface View {
-  parentView: Option<View>;
+  parentView: Nullable<View>;
   renderer: Renderer;
   tagName: string | null;
   elementId: string | null;
@@ -335,7 +336,11 @@ export class Renderer {
 
     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(
@@ -459,7 +464,7 @@ export class Renderer {
     this._clearAllRoots();
   }
 
-  getElement(view: View): Option<Element> {
+  getElement(view: View): Nullable<Element> {
     if (this._isInteractive) {
       return getViewElement(view);
     } else {
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 9496140c0fa..5ad07efc0c4 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -9,12 +9,12 @@ import type {
   CompileTimeResolver,
   HelperDefinitionState,
   ModifierDefinitionState,
-  Option,
   ResolvedComponentDefinition,
   RuntimeResolver,
   Template,
   TemplateFactory,
 } from '@glimmer/interfaces';
+import type { Nullable } from '@ember/-internals/utility-types';
 import {
   getComponentTemplate,
   getInternalComponentManager,
@@ -30,7 +30,6 @@ import {
   templateOnlyComponent,
   TEMPLATE_ONLY_COMPONENT_MANAGER,
 } from '@glimmer/runtime';
-import { _WeakSet } from '@glimmer/util';
 import { isCurlyManager } from './component-managers/curly';
 import { CLASSIC_HELPER_MANAGER, isClassicHelper } from './helper';
 import { default as disallowDynamicResolution } from './helpers/-disallow-dynamic-resolution';
@@ -56,7 +55,7 @@ function instrumentationPayload(name: string) {
 function componentFor(
   name: string,
   owner: InternalOwner
-): Option<InternalFactory<object> | object> {
+): Nullable<InternalFactory<object> | object> {
   let fullName = `component:${name}` as const;
   return owner.factoryFor(fullName) || null;
 }
@@ -65,7 +64,7 @@ function layoutFor(
   name: string,
   owner: InternalOwner,
   options?: RegisterOptions
-): Option<Template> {
+): Nullable<Template> {
   let templateFullName = `template:components/${name}` as const;
 
   return (owner.lookup(templateFullName, options) as Template) || null;
@@ -89,7 +88,7 @@ function lookupComponentPair(
   owner: InternalOwner,
   name: string,
   options?: RegisterOptions
-): Option<LookupResult> {
+): Nullable<LookupResult> {
   let component = componentFor(name, owner);
 
   if (isFactory(component) && component.class) {
@@ -157,7 +156,7 @@ const BUILTIN_MODIFIERS: Record<string, object> = {
   on,
 };
 
-const CLASSIC_HELPER_MANAGER_ASSOCIATED = new _WeakSet();
+const CLASSIC_HELPER_MANAGER_ASSOCIATED = new WeakSet();
 
 export default class ResolverImpl
   implements RuntimeResolver<InternalOwner>, CompileTimeResolver<InternalOwner>
@@ -168,7 +167,7 @@ export default class ResolverImpl
     return null;
   }
 
-  lookupHelper(name: string, owner: InternalOwner): Option<HelperDefinitionState> {
+  lookupHelper(name: string, owner: InternalOwner): Nullable<HelperDefinitionState> {
     assert(
       `You attempted to overwrite the built-in helper "${name}" which is not allowed. Please rename the helper.`,
       !(BUILTIN_HELPERS[name] && owner.hasRegistration(`helper:${name}`))
@@ -217,7 +216,7 @@ export default class ResolverImpl
     return BUILTIN_KEYWORD_HELPERS[name] ?? null;
   }
 
-  lookupModifier(name: string, owner: InternalOwner): Option<ModifierDefinitionState> {
+  lookupModifier(name: string, owner: InternalOwner): Nullable<ModifierDefinitionState> {
     let builtin = BUILTIN_MODIFIERS[name];
 
     if (builtin !== undefined) {
@@ -272,7 +271,7 @@ export default class ResolverImpl
 
     let finalizer = _instrumentStart('render.getComponentDefinition', instrumentationPayload, name);
 
-    let definition: Option<ResolvedComponentDefinition> = null;
+    let definition: Nullable<ResolvedComponentDefinition> = null;
 
     if (pair.component === null) {
       if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index 5a1c9f3c19a..d39399e1524 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -4,8 +4,9 @@
 import type { InternalOwner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import type { CapturedArguments, Option } from '@glimmer/interfaces';
-import { CurriedType } from '@glimmer/interfaces';
+import type { Nullable } from '@ember/-internals/utility-types';
+import type { CapturedArguments } from '@glimmer/interfaces';
+import { CurriedType } from '@glimmer/vm';
 import type { Reference } from '@glimmer/reference';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import type { CurriedValue } from '@glimmer/runtime';
@@ -56,7 +57,7 @@ import { internalHelper } from '../helpers/internal-helper';
 export const mountHelper = internalHelper(
   (args: CapturedArguments, owner?: InternalOwner): Reference<CurriedValue | null> => {
     assert('{{mount}} must be used within a component that has an owner', owner);
-    let nameRef = args.positional[0] as Reference<Option<string>>;
+    let nameRef = args.positional[0] as Reference<Nullable<string>>;
     let captured: CapturedArguments | null;
 
     assert(
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index 03de75066e5..debf7a97eb9 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -2,7 +2,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/interfaces';
+import { CurriedType } from '@glimmer/vm';
 import type { Reference } from '@glimmer/reference';
 import {
   childRefFromParts,
@@ -110,7 +110,10 @@ export const outletHelper = internalHelper(
   }
 );
 
-function stateFor(ref: Reference, outlet: OutletState | undefined): OutletDefinitionState | null {
+function stateFor(
+  ref: Reference<OutletState | undefined>,
+  outlet: OutletState | undefined
+): OutletDefinitionState | null {
   if (outlet === undefined) return null;
   let render = outlet.render;
   if (render === undefined) return null;
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
index 64b1a2dd301..c4ee2eb856b 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
@@ -1,6 +1,7 @@
-import type { Core, Option, PresentArray } from '@glimmer/interfaces';
+import type { Core, PresentArray } from '@glimmer/interfaces';
+import type { Nullable } from '@ember/-internals/utility-types';
 
-export function hashToArgs(hash: Option<Core.Hash>): Option<Core.Hash> {
+export function hashToArgs(hash: Nullable<Core.Hash>): Nullable<Core.Hash> {
   if (hash === null) return null;
   let names = hash[0].map((key) => `@${key}`);
   return [names as PresentArray<string>, hash[1]];
diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
index 7b5c4657f8b..a8f8f98ac57 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
@@ -2,13 +2,13 @@ import { objectAt } from '@ember/-internals/metal';
 import type EmberArray from '@ember/array';
 import { isEmberArray } from '@ember/array/-internals';
 import { isObject } from '@ember/-internals/utils';
-import type { Option } from '@glimmer/interfaces';
+import type { Nullable } from '@ember/-internals/utility-types';
 import type { IteratorDelegate } from '@glimmer/reference';
 import { consumeTag, isTracking, tagFor } from '@glimmer/validator';
 import { EachInWrapper } from '../helpers/each-in';
 import type { NativeArray } from '@ember/array';
 
-export default function toIterator(iterable: unknown): Option<IteratorDelegate> {
+export default function toIterator(iterable: unknown): Nullable<IteratorDelegate> {
   if (iterable instanceof EachInWrapper) {
     return toEachInIterator(iterable.inner);
   } else {
diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index 14ae5742766..4f7c13603dd 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -2,7 +2,6 @@ import type { Meta } from '@ember/-internals/meta';
 import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { isObject } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import { _WeakSet } from '@glimmer/util';
 import type { Tag, TagMeta } from '@glimmer/validator';
 import {
   combine,
@@ -14,7 +13,7 @@ import {
 import { objectAt } from './array';
 import { tagForProperty } from './tags';
 
-export const CHAIN_PASS_THROUGH = new _WeakSet();
+export const CHAIN_PASS_THROUGH = new WeakSet();
 
 export function finishLazyChains(meta: Meta, key: string, value: any) {
   let lazyTags = meta.readableLazyChainsFor(key);
diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index 71bc8ad6494..d2bf0ff2ccb 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -2,7 +2,6 @@ import type { Meta } from '@ember/-internals/meta';
 import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { _WeakSet as WeakSet } from '@glimmer/util';
 
 export type DecoratorPropertyDescriptor = (PropertyDescriptor & { initializer?: any }) | undefined;
 
diff --git a/packages/@ember/-internals/package.json b/packages/@ember/-internals/package.json
index 5f15c095ca3..ee47dc65de7 100644
--- a/packages/@ember/-internals/package.json
+++ b/packages/@ember/-internals/package.json
@@ -38,22 +38,23 @@
     "@ember/service": "workspace:*",
     "@ember/template-factory": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/compiler": "0.84.3",
+    "@glimmer/compiler": "0.85.13",
     "@glimmer/component": "^1.1.2",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.84.3",
-    "@glimmer/interfaces": "0.84.3",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/node": "0.84.3",
-    "@glimmer/opcode-compiler": "0.84.3",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/program": "0.84.3",
-    "@glimmer/reference": "0.84.3",
-    "@glimmer/runtime": "0.84.3",
-    "@glimmer/syntax": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/global-context": "0.85.13",
+    "@glimmer/interfaces": "0.85.13",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/node": "0.85.13",
+    "@glimmer/opcode-compiler": "0.85.13",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/program": "0.85.13",
+    "@glimmer/reference": "0.85.13",
+    "@glimmer/runtime": "0.85.13",
+    "@glimmer/syntax": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
+    "@glimmer/vm": "0.85.13",
     "@simple-dom/interface": "^1.4.0",
     "backburner.js": "^2.7.0",
     "dag-map": "^2.0.2",
@@ -64,4 +65,5 @@
     "router_js": "^8.0.3",
     "rsvp": "^4.8.5"
   }
-}
\ No newline at end of file
+}
+
diff --git a/packages/@ember/-internals/utility-types/index.ts b/packages/@ember/-internals/utility-types/index.ts
index f03be1a0b57..6af995a3a0d 100644
--- a/packages/@ember/-internals/utility-types/index.ts
+++ b/packages/@ember/-internals/utility-types/index.ts
@@ -7,9 +7,9 @@ export type MethodsOf<T> = {
   // This `keyof` check is the thing which gives us *only* these keys, and no
   // `foo: never` appears in the final type.
   [K in keyof T as T[K] extends AnyFn ? K : never]:
-    // While this makes sure the resolved type only has `AnyFn` in it, so that
-    // the resulting type is known to be only function types.
-    T[K] extends AnyFn ? T[K] : never;
+  // While this makes sure the resolved type only has `AnyFn` in it, so that
+  // the resulting type is known to be only function types.
+  T[K] extends AnyFn ? T[K] : never;
 };
 
 export type MethodNamesOf<T> = keyof MethodsOf<T>;
@@ -28,3 +28,5 @@ declare const Data: unique symbol;
 export class Opaque<Data> {
   private declare [Data]: Data;
 }
+
+export type Nullable<T> = T | null;
diff --git a/packages/@ember/-internals/utils/lib/is_proxy.ts b/packages/@ember/-internals/utils/lib/is_proxy.ts
index 87323a9abec..443e4c805b0 100644
--- a/packages/@ember/-internals/utils/lib/is_proxy.ts
+++ b/packages/@ember/-internals/utils/lib/is_proxy.ts
@@ -1,5 +1,4 @@
 import type ProxyMixin from '@ember/-internals/runtime/lib/mixins/-proxy';
-import { _WeakSet as WeakSet } from '@glimmer/util';
 import { isObject } from './spec';
 
 const PROXIES = new WeakSet();
diff --git a/packages/@ember/-internals/utils/lib/mandatory-setter.ts b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
index e30fe4c9c21..92e157f8d8e 100644
--- a/packages/@ember/-internals/utils/lib/mandatory-setter.ts
+++ b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
@@ -1,6 +1,5 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { _WeakSet as WeakSet } from '@glimmer/util';
 import type { Tag } from '@glimmer/validator';
 import lookupDescriptor from './lookup-descriptor';
 
diff --git a/packages/@ember/-internals/utils/lib/super.ts b/packages/@ember/-internals/utils/lib/super.ts
index 2123597675a..2c862bfc410 100644
--- a/packages/@ember/-internals/utils/lib/super.ts
+++ b/packages/@ember/-internals/utils/lib/super.ts
@@ -1,5 +1,3 @@
-import { _WeakSet as WeakSet } from '@glimmer/util';
-
 const HAS_SUPER_PATTERN = /\.(_super|call\(this|apply\(this)/;
 const fnToString = Function.prototype.toString;
 
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index e00a6f74d44..d9c798ab2c4 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -3,7 +3,9 @@ import type { InternalOwner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import type { Dict, Option } from '@glimmer/interfaces';
+import type { Dict } from '@glimmer/interfaces';
+
+import type { Nullable } from '@ember/-internals/utility-types';
 
 /**
 @module ember
@@ -70,7 +72,7 @@ export function getViewId(view: View): string {
 const ELEMENT_VIEW: WeakMap<Element, View> = new WeakMap();
 const VIEW_ELEMENT: WeakMap<View, Element> = new WeakMap();
 
-export function getElementView(element: Element): Option<View> {
+export function getElementView(element: Element): Nullable<View> {
   return ELEMENT_VIEW.get(element) || null;
 }
 
@@ -79,7 +81,7 @@ export function getElementView(element: Element): Option<View> {
   @method getViewElement
   @param {Ember.View} view
  */
-export function getViewElement(view: View): Option<Element> {
+export function getViewElement(view: View): Nullable<Element> {
   return VIEW_ELEMENT.get(view) || null;
 }
 
@@ -226,7 +228,7 @@ export function contains(a: Node, b: Node): boolean {
     return a.contains(b);
   }
 
-  let current: Option<Node> = b.parentNode;
+  let current: Nullable<Node> = b.parentNode;
 
   while (current && (current = current.parentNode)) {
     if (current === a) {
diff --git a/packages/@ember/application/package.json b/packages/@ember/application/package.json
index a3cc9afc860..7f18eea8c24 100644
--- a/packages/@ember/application/package.json
+++ b/packages/@ember/application/package.json
@@ -19,11 +19,11 @@
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "backburner.js": "^2.7.0",
     "dag-map": "^2.0.2",
     "ember": "workspace:*",
@@ -32,4 +32,4 @@
     "internal-test-helpers": "workspace:*",
     "router_js": "^8.0.3"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/array/-internals.ts b/packages/@ember/array/-internals.ts
index 3c3d2bc2deb..e25e288d641 100644
--- a/packages/@ember/array/-internals.ts
+++ b/packages/@ember/array/-internals.ts
@@ -1,7 +1,6 @@
 import type { EmberArrayLike } from '@ember/array';
-import { _WeakSet } from '@glimmer/util';
 
-const EMBER_ARRAYS = new _WeakSet();
+const EMBER_ARRAYS = new WeakSet();
 
 export function setEmberArray(obj: object) {
   EMBER_ARRAYS.add(obj);
diff --git a/packages/@ember/array/package.json b/packages/@ember/array/package.json
index aafeb6fd541..4d5cfa27c1c 100644
--- a/packages/@ember/array/package.json
+++ b/packages/@ember/array/package.json
@@ -16,13 +16,13 @@
     "@ember/object": "workspace:*",
     "@ember/runloop": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/component/package.json b/packages/@ember/component/package.json
index 3365807b784..23176917343 100644
--- a/packages/@ember/component/package.json
+++ b/packages/@ember/component/package.json
@@ -9,8 +9,8 @@
   },
   "dependencies": {
     "@ember/-internals": "workspace:*",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/runtime": "0.84.3",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/runtime": "0.85.13",
     "expect-type": "^0.15.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/controller/package.json b/packages/@ember/controller/package.json
index 14958077e85..19d288aac94 100644
--- a/packages/@ember/controller/package.json
+++ b/packages/@ember/controller/package.json
@@ -11,12 +11,12 @@
     "@ember/debug": "workspace:*",
     "@ember/object": "workspace:*",
     "@ember/service": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/debug/lib/inspect.ts b/packages/@ember/debug/lib/inspect.ts
index c6e532e955b..6dfe664ed91 100644
--- a/packages/@ember/debug/lib/inspect.ts
+++ b/packages/@ember/debug/lib/inspect.ts
@@ -1,4 +1,3 @@
-import { _WeakSet as WeakSet } from '@glimmer/util';
 import { assert } from '@ember/debug';
 const { toString: objectToString } = Object.prototype;
 const { toString: functionToString } = Function.prototype;
diff --git a/packages/@ember/debug/package.json b/packages/@ember/debug/package.json
index 5eabaf8b6f9..424b54fe321 100644
--- a/packages/@ember/debug/package.json
+++ b/packages/@ember/debug/package.json
@@ -18,14 +18,14 @@
     "@ember/routing": "workspace:*",
     "@ember/runloop": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "backburner.js": "^2.7.0",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/destroyable/package.json b/packages/@ember/destroyable/package.json
index 651dd21e493..e63ac47b199 100644
--- a/packages/@ember/destroyable/package.json
+++ b/packages/@ember/destroyable/package.json
@@ -6,7 +6,7 @@
     ".": "./index.ts"
   },
   "dependencies": {
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "expect-type": "^0.15.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/engine/package.json b/packages/@ember/engine/package.json
index fe5f62e9bee..5114934b5a3 100644
--- a/packages/@ember/engine/package.json
+++ b/packages/@ember/engine/package.json
@@ -18,14 +18,14 @@
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "dag-map": "^2.0.2",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*",
     "router_js": "^8.0.3"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/enumerable/package.json b/packages/@ember/enumerable/package.json
index f667899f108..b2ccb6b288d 100644
--- a/packages/@ember/enumerable/package.json
+++ b/packages/@ember/enumerable/package.json
@@ -11,11 +11,11 @@
     "@ember/array": "workspace:*",
     "@ember/debug": "workspace:*",
     "@ember/object": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "internal-test-helpers": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/helper/package.json b/packages/@ember/helper/package.json
index 108c5d88448..e48449521e1 100644
--- a/packages/@ember/helper/package.json
+++ b/packages/@ember/helper/package.json
@@ -8,8 +8,8 @@
   "dependencies": {
     "@ember/-internals": "workspace:*",
     "@ember/component": "workspace:*",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/runtime": "0.84.3",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/runtime": "0.85.13",
     "expect-type": "^0.15.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/instrumentation/package.json b/packages/@ember/instrumentation/package.json
index 1a57c16411a..887dd0011c5 100644
--- a/packages/@ember/instrumentation/package.json
+++ b/packages/@ember/instrumentation/package.json
@@ -14,7 +14,7 @@
     "@ember/runloop": "workspace:*",
     "@ember/utils": "workspace:*",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/validator": "0.85.13",
     "internal-test-helpers": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/modifier/package.json b/packages/@ember/modifier/package.json
index 8b4f98de789..8c0a5642206 100644
--- a/packages/@ember/modifier/package.json
+++ b/packages/@ember/modifier/package.json
@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "@ember/-internals": "workspace:*",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/runtime": "0.84.3"
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/runtime": "0.85.13"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
index c61c16c1494..9eb4fcd509e 100644
--- a/packages/@ember/object/core.ts
+++ b/packages/@ember/object/core.ts
@@ -22,7 +22,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';
 
diff --git a/packages/@ember/object/mixin.ts b/packages/@ember/object/mixin.ts
index 330529045e9..dc7ce6afb8b 100644
--- a/packages/@ember/object/mixin.ts
+++ b/packages/@ember/object/mixin.ts
@@ -7,7 +7,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 {
   type ComputedDecorator,
   type ComputedPropertyGetter,
@@ -450,7 +449,7 @@ export function mixin(obj: object, ...args: any[]) {
   return obj;
 }
 
-const MIXINS = new _WeakSet();
+const MIXINS = new WeakSet();
 
 /**
   The `Mixin` class allows you to create mixins, whose properties can be
diff --git a/packages/@ember/object/package.json b/packages/@ember/object/package.json
index 725c2c3505b..bc795b362fc 100644
--- a/packages/@ember/object/package.json
+++ b/packages/@ember/object/package.json
@@ -26,13 +26,13 @@
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/routing/lib/dsl.ts b/packages/@ember/routing/lib/dsl.ts
index f401e6cf811..ddc0a941be8 100644
--- a/packages/@ember/routing/lib/dsl.ts
+++ b/packages/@ember/routing/lib/dsl.ts
@@ -1,6 +1,6 @@
 import type { InternalFactory } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
-import type { Option } from '@glimmer/interfaces';
+import type { Nullable } from '@ember/-internals/utility-types';
 import type { MatchCallback } from 'route-recognizer';
 import type { EngineInfo, EngineRouteInfo } from './engines';
 
@@ -67,7 +67,7 @@ export default class DSLImpl implements DSL {
   route(name: string, options: RouteOptions, callback: DSLCallback): void;
   route(name: string, _options?: RouteOptions | DSLCallback, _callback?: DSLCallback): void {
     let options: RouteOptions;
-    let callback: Option<DSLCallback> = null;
+    let callback: Nullable<DSLCallback> = null;
 
     let dummyErrorRoute = `/_unused_dummy_error_path_route_${name}/:error`;
     if (isCallback(_options)) {
diff --git a/packages/@ember/routing/package.json b/packages/@ember/routing/package.json
index 70c70e4be92..94ccbaa2d82 100644
--- a/packages/@ember/routing/package.json
+++ b/packages/@ember/routing/package.json
@@ -25,16 +25,16 @@
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "backburner.js": "^2.7.0",
     "dag-map": "^2.0.2",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*",
     "router_js": "^8.0.3"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/runloop/package.json b/packages/@ember/runloop/package.json
index 8c8fb3e76ea..633180ef985 100644
--- a/packages/@ember/runloop/package.json
+++ b/packages/@ember/runloop/package.json
@@ -13,9 +13,9 @@
     "@ember/object": "workspace:*",
     "@ember/utils": "workspace:*",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/validator": "0.85.13",
     "backburner.js": "^2.7.0",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/service/package.json b/packages/@ember/service/package.json
index 69d4aa09f0c..0f0cbb53461 100644
--- a/packages/@ember/service/package.json
+++ b/packages/@ember/service/package.json
@@ -10,12 +10,12 @@
     "@ember/array": "workspace:*",
     "@ember/debug": "workspace:*",
     "@ember/object": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/template-compilation/package.json b/packages/@ember/template-compilation/package.json
index 00f24ff4e90..3a1f606f5de 100644
--- a/packages/@ember/template-compilation/package.json
+++ b/packages/@ember/template-compilation/package.json
@@ -8,10 +8,10 @@
   "dependencies": {
     "@ember/-internals": "workspace:*",
     "@ember/canary-features": "workspace:*",
-    "@glimmer/compiler": "0.84.3",
+    "@glimmer/compiler": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/syntax": "0.84.3",
+    "@glimmer/syntax": "0.85.13",
     "ember": "workspace:*",
     "ember-template-compiler": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/template-factory/package.json b/packages/@ember/template-factory/package.json
index 3ca216f0ef3..f7af03ab4c1 100644
--- a/packages/@ember/template-factory/package.json
+++ b/packages/@ember/template-factory/package.json
@@ -6,6 +6,6 @@
     ".": "./index.ts"
   },
   "dependencies": {
-    "@glimmer/opcode-compiler": "0.84.3"
+    "@glimmer/opcode-compiler": "0.85.13"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/utils/package.json b/packages/@ember/utils/package.json
index a0c25998771..401c8e9d802 100644
--- a/packages/@ember/utils/package.json
+++ b/packages/@ember/utils/package.json
@@ -13,13 +13,13 @@
     "@ember/enumerable": "workspace:*",
     "@ember/object": "workspace:*",
     "@ember/runloop": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "expect-type": "^0.15.0",
     "internal-test-helpers": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/@ember/version/package.json b/packages/@ember/version/package.json
index 01efc3f1715..e6f48cf45e3 100644
--- a/packages/@ember/version/package.json
+++ b/packages/@ember/version/package.json
@@ -22,10 +22,10 @@
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/runtime": "0.84.3",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/runtime": "0.85.13",
     "backburner.js": "^2.7.0",
     "ember": "workspace:*",
     "expect-type": "^0.15.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/ember-template-compiler/package.json b/packages/ember-template-compiler/package.json
index 1b108f9ad83..043698f8244 100644
--- a/packages/ember-template-compiler/package.json
+++ b/packages/ember-template-compiler/package.json
@@ -22,14 +22,14 @@
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/compiler": "0.84.3",
+    "@glimmer/compiler": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/runtime": "0.84.3",
-    "@glimmer/syntax": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/runtime": "0.85.13",
+    "@glimmer/syntax": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "backburner.js": "^2.7.0",
     "ember": "workspace:*",
     "internal-test-helpers": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/ember-template-compiler/tests/utils/transform-test-case.ts b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
index 768a733d1a8..f95ea741a0b 100644
--- a/packages/ember-template-compiler/tests/utils/transform-test-case.ts
+++ b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
@@ -1,5 +1,5 @@
 import { precompile } from '@glimmer/compiler';
-import type { Option } from '@glimmer/interfaces';
+import type { Nullable } from '@ember/-internals/utility-types';
 import type { AST, ASTPlugin } from '@glimmer/syntax';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { compileOptions } from '../../index';
@@ -11,7 +11,7 @@ export default abstract class extends AbstractTestCase {
 }
 
 function ast(template: string): AST.Program {
-  let program: Option<AST.Program> = null;
+  let program: Nullable<AST.Program> = null;
 
   function extractProgram(): ASTPlugin {
     return {
diff --git a/packages/ember-testing/package.json b/packages/ember-testing/package.json
index a2ff601a09b..a0621ac77cf 100644
--- a/packages/ember-testing/package.json
+++ b/packages/ember-testing/package.json
@@ -19,14 +19,14 @@
     "@ember/service": "workspace:*",
     "@ember/test": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "backburner.js": "^2.7.0",
     "ember": "workspace:*",
     "internal-test-helpers": "workspace:*",
     "router_js": "^8.0.3"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/ember/package.json b/packages/ember/package.json
index 4bc30570a9e..d40d5a3cdac 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -31,14 +31,14 @@
     "@ember/test": "workspace:*",
     "@ember/utils": "workspace:*",
     "@ember/version": "workspace:*",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/runtime": "0.84.3",
-    "@glimmer/util": "0.84.3",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/runtime": "0.85.13",
+    "@glimmer/util": "0.85.13",
     "@glimmer/tracking": "workspace:*",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/validator": "0.85.13",
     "backburner.js": "^2.7.0",
     "dag-map": "^2.0.2",
     "ember-template-compiler": "workspace:*",
@@ -47,4 +47,4 @@
     "router_js": "^8.0.3",
     "rsvp": "^4.8.5"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/external-helpers/lib/external-helpers.js b/packages/external-helpers/lib/external-helpers.js
index c021c577804..32d05a4de8d 100644
--- a/packages/external-helpers/lib/external-helpers.js
+++ b/packages/external-helpers/lib/external-helpers.js
@@ -9,6 +9,19 @@ const hasReflectConstruct = typeof Reflect === 'object' && typeof Reflect.constr
 
 const nativeWrapperCache = new Map();
 
+// Implementations:
+// https://github.com/babel/babel/blob/436d78920883603668666210a4aacf524257bc3b/packages/babel-helpers/src/helpers.ts#L958
+let privateFieldId = 0;
+export function classPrivateFieldLooseKey(name) {
+  return '__private_' + privateFieldId++ + '_' + name;
+}
+export function classPrivateFieldLooseBase(receiver, privateKey) {
+  if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) {
+    throw new TypeError('attempted to use private field on non-instance');
+  }
+  return receiver;
+}
+
 // Super minimal version of Babel's wrapNativeSuper. We only use this for
 // extending Function, for ComputedDecoratorImpl and AliasDecoratorImpl. We know
 // we will never directly create an instance of these classes so no need to
diff --git a/packages/internal-test-helpers/package.json b/packages/internal-test-helpers/package.json
index df0c28126d2..2ed0693286e 100644
--- a/packages/internal-test-helpers/package.json
+++ b/packages/internal-test-helpers/package.json
@@ -24,16 +24,16 @@
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
-    "@glimmer/compiler": "0.84.3",
-    "@glimmer/destroyable": "0.84.3",
+    "@glimmer/compiler": "0.85.13",
+    "@glimmer/destroyable": "0.85.13",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/manager": "0.84.3",
-    "@glimmer/opcode-compiler": "0.84.3",
-    "@glimmer/owner": "0.84.3",
-    "@glimmer/runtime": "0.84.3",
-    "@glimmer/syntax": "0.84.3",
-    "@glimmer/util": "0.84.3",
-    "@glimmer/validator": "0.84.3",
+    "@glimmer/manager": "0.85.13",
+    "@glimmer/opcode-compiler": "0.85.13",
+    "@glimmer/owner": "0.85.13",
+    "@glimmer/runtime": "0.85.13",
+    "@glimmer/syntax": "0.85.13",
+    "@glimmer/util": "0.85.13",
+    "@glimmer/validator": "0.85.13",
     "backburner.js": "^2.7.0",
     "dag-map": "^2.0.2",
     "ember": "workspace:*",
@@ -42,4 +42,4 @@
     "rsvp": "^4.8.5",
     "simple-html-tokenizer": "^0.5.11"
   }
-}
\ No newline at end of file
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6638f658ce5..6a43c386855 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,69 +1,74 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: false
+  excludeLinksFromLockfile: false
+
 overrides:
   socket.io: ^4.7.0
+  rollup: ^4.2.0
 
 dependencies:
   '@babel/helper-module-imports':
     specifier: ^7.16.7
     version: 7.22.15
-  '@babel/plugin-transform-block-scoping':
-    specifier: ^7.22.5
-    version: 7.23.0(@babel/core@7.23.2)
   '@ember/edition-utils':
     specifier: ^1.2.0
     version: 1.2.0
   '@glimmer/compiler':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/component':
     specifier: ^1.1.2
     version: 1.1.2(@babel/core@7.23.2)
   '@glimmer/destroyable':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/env':
     specifier: ^0.1.7
     version: 0.1.7
   '@glimmer/global-context':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/interfaces':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/manager':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/node':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/opcode-compiler':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/owner':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/program':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/reference':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/runtime':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/syntax':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/util':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/validator':
-    specifier: 0.84.3
-    version: 0.84.3
+    specifier: 0.85.13
+    version: 0.85.13
+  '@glimmer/vm':
+    specifier: 0.85.13
+    version: 0.85.13
   '@glimmer/vm-babel-plugins':
-    specifier: 0.84.3
-    version: 0.84.3(@babel/core@7.23.2)
+    specifier: 0.85.13
+    version: 0.85.13(@babel/core@7.23.2)
   '@simple-dom/interface':
     specifier: ^1.4.0
     version: 1.4.0
@@ -951,7 +956,7 @@ packages:
       '@babel/traverse': 7.23.2
       '@babel/types': 7.23.0
       convert-source-map: 2.0.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -1025,7 +1030,7 @@ packages:
       '@babel/core': 7.23.2
       '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -2082,7 +2087,7 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.23.0
       '@babel/types': 7.23.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -2138,7 +2143,7 @@ packages:
     engines: {node: 12.* || 14.* || >= 16}
     dependencies:
       babel-import-util: 2.0.1
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       ember-rfc176-data: 0.3.18
       fs-extra: 9.1.0
       js-string-escape: 1.0.1
@@ -2367,7 +2372,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       espree: 9.6.1
       globals: 13.23.0
       ignore: 5.2.4
@@ -2384,14 +2389,15 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@glimmer/compiler@0.84.3:
-    resolution: {integrity: sha512-cj9sGlnvExP9httxY6ZMivJRGulyaZ31DddCYB5h6LxupR4Nk2d1nAJCWPLsvuQJ8qR+eYw0y9aiY/VeT0krpQ==}
+  /@glimmer/compiler@0.85.13:
+    resolution: {integrity: sha512-To8a+yScHAHE9/PpwuHyz2yYTBM2+m1Z6l4B9A6LgjkKeu0K7plv2c03V9JpsA3mMJBROJ1mfxOUuQsvTidEkg==}
+    engines: {node: '>= 16.0.0'}
     dependencies:
-      '@glimmer/interfaces': 0.84.3
-      '@glimmer/syntax': 0.84.3
-      '@glimmer/util': 0.84.3
-      '@glimmer/wire-format': 0.84.3
-      '@simple-dom/interface': 1.4.0
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/syntax': 0.85.13
+      '@glimmer/util': 0.85.13
+      '@glimmer/vm': 0.85.13
+      '@glimmer/wire-format': 0.85.13
     dev: false
 
   /@glimmer/component@1.1.2(@babel/core@7.23.2):
@@ -2417,34 +2423,39 @@ packages:
       - supports-color
     dev: false
 
-  /@glimmer/destroyable@0.84.3:
-    resolution: {integrity: sha512-4tUw5UR4ntuySPvbcWyCMRjqxMJMV1GewjU3zGq22XvuBVFfq2K9WmuYV9H9FHg8X0MgDwcus+LjxrVSel39Sw==}
+  /@glimmer/debug@0.85.13:
+    resolution: {integrity: sha512-BguKA6RXbCskyRHfJn+Tm/z0aBwefgYQ4RFz/0lVqYB3lJz8Oo02SDrtHQTwBMC9x/nF9GVA//60R4P47aryWg==}
+    dependencies:
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/util': 0.85.13
+      '@glimmer/vm': 0.85.13
+    dev: false
+
+  /@glimmer/destroyable@0.85.13:
+    resolution: {integrity: sha512-fE3bhjDAzYsYQ+rm1qlu+6kP8f0CClHYynp1CWhskDc+qM0Jt7Up08htZK8/Ttaw7RXgi43Fe7FrQtOMUlrVlg==}
     dependencies:
       '@glimmer/env': 0.1.7
-      '@glimmer/global-context': 0.84.3
-      '@glimmer/interfaces': 0.84.3
-      '@glimmer/util': 0.84.3
+      '@glimmer/global-context': 0.85.13
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/util': 0.85.13
     dev: false
 
   /@glimmer/di@0.1.11:
     resolution: {integrity: sha512-moRwafNDwHTnTHzyyZC9D+mUSvYrs1Ak0tRPjjmCghdoHHIvMshVbEnwKb/1WmW5CUlKc2eL9rlAV32n3GiItg==}
     dev: false
 
-  /@glimmer/encoder@0.84.3:
-    resolution: {integrity: sha512-T99YQDhNC/1rOFgiz8k4uzgzQsQ+r1my+WVXRv26o0r+/yOnKYndrb6WH/E9d+XtBIZbm1yCSm2BMFYelR0Nrg==}
+  /@glimmer/encoder@0.85.13:
+    resolution: {integrity: sha512-GukVAeHxDAucbiExjl8lV8BYQXTkV2Co8IXnX5vKaomcZ+fwudGmvzbo2myq+WZ1llqnkZ45DVcqa9BVh9eNWg==}
     dependencies:
-      '@glimmer/env': 0.1.7
-      '@glimmer/interfaces': 0.84.3
-      '@glimmer/vm': 0.84.3
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/vm': 0.85.13
     dev: false
 
   /@glimmer/env@0.1.7:
     resolution: {integrity: sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==}
 
-  /@glimmer/global-context@0.84.3:
-    resolution: {integrity: sha512-8Oy9Wg5IZxMEeAnVmzD2NkObf89BeHoFSzJgJROE/deutd3rxg83mvlOez4zBBGYwnTb+VGU2LYRpet92egJjA==}
-    dependencies:
-      '@glimmer/env': 0.1.7
+  /@glimmer/global-context@0.85.13:
+    resolution: {integrity: sha512-JY/TQ+9dyukQVuTwKlF3jVXaWUwxx676KtclYf6SphtJQu2/mysxqj9XIAowOahhi9m7E7hzHkxAl9bm2FXXjQ==}
     dev: false
 
   /@glimmer/interfaces@0.84.3:
@@ -2452,87 +2463,94 @@ packages:
     dependencies:
       '@simple-dom/interface': 1.4.0
 
-  /@glimmer/low-level@0.78.2:
-    resolution: {integrity: sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==}
+  /@glimmer/interfaces@0.85.13:
+    resolution: {integrity: sha512-qOEdvFgCQX1g+Gfi/nA2zbKYPmEkEbhFgzZ5esgmlQNOSQx4j8nyGiBvnG/vepHrh4wUzTvIynrCQpfr3SiKXg==}
+    dependencies:
+      '@simple-dom/interface': 1.4.0
     dev: false
 
-  /@glimmer/manager@0.84.3:
-    resolution: {integrity: sha512-FtcwvrQ3HWlGRGChwlXiisMeKf9+XcCkMwVrrO0cxQavT01tIHx40OFtPOhXKGbgXGtRKcJI8XR41aK9t2kvyg==}
+  /@glimmer/manager@0.85.13:
+    resolution: {integrity: sha512-HwJoD9qAVPQ6hHNMUFTvQtJi5NIO1JzOT0kauyln754G6ggT07IFmi+b1R4WeJJJndZpuR3Ad4PS4usRnI89Zw==}
     dependencies:
-      '@glimmer/destroyable': 0.84.3
+      '@glimmer/debug': 0.85.13
+      '@glimmer/destroyable': 0.85.13
       '@glimmer/env': 0.1.7
-      '@glimmer/global-context': 0.84.3
-      '@glimmer/interfaces': 0.84.3
-      '@glimmer/reference': 0.84.3
-      '@glimmer/util': 0.84.3
-      '@glimmer/validator': 0.84.3
+      '@glimmer/global-context': 0.85.13
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/reference': 0.85.13
+      '@glimmer/util': 0.85.13
+      '@glimmer/validator': 0.85.13
+      '@glimmer/vm': 0.85.13
     dev: false
 
-  /@glimmer/node@0.84.3:
-    resolution: {integrity: sha512-QXlZjr7X6DDTJ3wiYQIHv2Pq/5sdGeTTW15+U+IosjZuQgvwCPJaeXC2CU8yqgA33yHgMgJpkdvLnPUCPrrhwg==}
+  /@glimmer/node@0.85.13:
+    resolution: {integrity: sha512-Lb/0zPoucm8hQ/qd6A8RYgdoLSC5tulZJ7LahAq1/bpG42vJyQMGYBjxVL2ffQv+Yxao/nEQxUP5ssoLXS+gvw==}
     dependencies:
-      '@glimmer/interfaces': 0.84.3
-      '@glimmer/runtime': 0.84.3
-      '@glimmer/util': 0.84.3
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/runtime': 0.85.13
+      '@glimmer/util': 0.85.13
       '@simple-dom/document': 1.4.0
-      '@simple-dom/interface': 1.4.0
     dev: false
 
-  /@glimmer/opcode-compiler@0.84.3:
-    resolution: {integrity: sha512-flUuikKLFL9cekJUA10gJxMRCDjUPb61R3UCl1u69TGN0Nm7FTsMhOsVDtJLeeiAROtPx+NvasPw/6UB1rrdyg==}
+  /@glimmer/opcode-compiler@0.85.13:
+    resolution: {integrity: sha512-EySW/IsMoO+lWW2TC31zsHqanST/5lTGoZOrB9zy7FmiUaPGD0RxeOEBU8rTRHzYxNzoJAsX7l3Hv6Y0y2ABZg==}
     dependencies:
-      '@glimmer/encoder': 0.84.3
+      '@glimmer/debug': 0.85.13
+      '@glimmer/encoder': 0.85.13
       '@glimmer/env': 0.1.7
-      '@glimmer/interfaces': 0.84.3
-      '@glimmer/reference': 0.84.3
-      '@glimmer/util': 0.84.3
-      '@glimmer/vm': 0.84.3
-      '@glimmer/wire-format': 0.84.3
+      '@glimmer/global-context': 0.85.13
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/manager': 0.85.13
+      '@glimmer/reference': 0.85.13
+      '@glimmer/util': 0.85.13
+      '@glimmer/vm': 0.85.13
+      '@glimmer/wire-format': 0.85.13
     dev: false
 
-  /@glimmer/owner@0.84.3:
-    resolution: {integrity: sha512-ZwA0rU4V8m0z4ncXtWD2QEU6eh61wkKKQUThahPYhfB+JYceVM6Grx7uWeiAxc2v3ncpvbYqIGdnICXDMloxAA==}
+  /@glimmer/owner@0.85.13:
+    resolution: {integrity: sha512-4FhMR9qHuKu7sZIIsulqBvzP9UWYFtjxzF+eQ5cxmr+0uxjJN8/rZbRG8vPbJs3OoV2k+vHj4BYhLyflSjRaZw==}
     dependencies:
-      '@glimmer/util': 0.84.3
+      '@glimmer/util': 0.85.13
     dev: false
 
-  /@glimmer/program@0.84.3:
-    resolution: {integrity: sha512-D8z1lP8NEMyzT8gByFsZpmbRThZvGLS0Tl5AngaDbI2FqlcpEV0ujvLTzzgecd9QQ1k3Cd60dTgy/2N2CI82SA==}
+  /@glimmer/program@0.85.13:
+    resolution: {integrity: sha512-E+89jmD+52fB2/HqeOW2vim1x8wNTkpfPpzsGeVFlyZHxBaMR95zw1+rgl2aE1pyRoZR3csL4qSBaJb26Sp6Pw==}
     dependencies:
-      '@glimmer/encoder': 0.84.3
+      '@glimmer/encoder': 0.85.13
       '@glimmer/env': 0.1.7
-      '@glimmer/interfaces': 0.84.3
-      '@glimmer/manager': 0.84.3
-      '@glimmer/opcode-compiler': 0.84.3
-      '@glimmer/util': 0.84.3
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/manager': 0.85.13
+      '@glimmer/opcode-compiler': 0.85.13
+      '@glimmer/util': 0.85.13
+      '@glimmer/vm': 0.85.13
+      '@glimmer/wire-format': 0.85.13
     dev: false
 
-  /@glimmer/reference@0.84.3:
-    resolution: {integrity: sha512-lV+p/aWPVC8vUjmlvYVU7WQJsLh319SdXuAWoX/SE3pq340BJlAJiEcAc6q52y9JNhT57gMwtjMX96W5Xcx/qw==}
+  /@glimmer/reference@0.85.13:
+    resolution: {integrity: sha512-rkMlY6RUkwZwfO7fQodKQw5WOLCKNZPkVAloaVJSqpyKjHRNjMaD3TZhfNmlGIVdNgVRRsOWSWdTL5CUUzDlwQ==}
     dependencies:
       '@glimmer/env': 0.1.7
-      '@glimmer/global-context': 0.84.3
-      '@glimmer/interfaces': 0.84.3
-      '@glimmer/util': 0.84.3
-      '@glimmer/validator': 0.84.3
+      '@glimmer/global-context': 0.85.13
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/util': 0.85.13
+      '@glimmer/validator': 0.85.13
     dev: false
 
-  /@glimmer/runtime@0.84.3:
-    resolution: {integrity: sha512-LzlJbPDCUH/wjsgJ5kRImvOkqAImSyVRW37t34n/1Qd3v7ZoI8xVQg92lS+2kHZe030sT49ZwKkEIeVZiBreBw==}
+  /@glimmer/runtime@0.85.13:
+    resolution: {integrity: sha512-jum5u2mX0WOAAF3L0pVZ/AOAMjJRKfGIqcStUYldmnf/xCFucKsh2WzSBS5KxlHDt4OGs00GflkpoTZkqPnCmg==}
     dependencies:
-      '@glimmer/destroyable': 0.84.3
+      '@glimmer/destroyable': 0.85.13
       '@glimmer/env': 0.1.7
-      '@glimmer/global-context': 0.84.3
-      '@glimmer/interfaces': 0.84.3
-      '@glimmer/low-level': 0.78.2
-      '@glimmer/owner': 0.84.3
-      '@glimmer/program': 0.84.3
-      '@glimmer/reference': 0.84.3
-      '@glimmer/util': 0.84.3
-      '@glimmer/validator': 0.84.3
-      '@glimmer/vm': 0.84.3
-      '@glimmer/wire-format': 0.84.3
-      '@simple-dom/interface': 1.4.0
+      '@glimmer/global-context': 0.85.13
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/manager': 0.85.13
+      '@glimmer/owner': 0.85.13
+      '@glimmer/program': 0.85.13
+      '@glimmer/reference': 0.85.13
+      '@glimmer/util': 0.85.13
+      '@glimmer/validator': 0.85.13
+      '@glimmer/vm': 0.85.13
+      '@glimmer/wire-format': 0.85.13
     dev: false
 
   /@glimmer/syntax@0.84.3:
@@ -2543,6 +2561,16 @@ packages:
       '@handlebars/parser': 2.0.0
       simple-html-tokenizer: 0.5.11
 
+  /@glimmer/syntax@0.85.13:
+    resolution: {integrity: sha512-zMGkJh6JcHdCTx1emmBbhBrGO04gqD6CS5khmDwSJCIpVHnGH0Ejxp9rpnSMc5IW71/hFoQY6RlMgVYF2hrHhA==}
+    dependencies:
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/util': 0.85.13
+      '@glimmer/wire-format': 0.85.13
+      '@handlebars/parser': 2.0.0
+      simple-html-tokenizer: 0.5.11
+    dev: false
+
   /@glimmer/util@0.44.0:
     resolution: {integrity: sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg==}
     dev: false
@@ -2554,33 +2582,43 @@ packages:
       '@glimmer/interfaces': 0.84.3
       '@simple-dom/interface': 1.4.0
 
-  /@glimmer/validator@0.84.3:
-    resolution: {integrity: sha512-RTBV4TokUB0vI31UC7ikpV7lOYpWUlyqaKV//pRC4pexYMlmqnVhkFrdiimB/R1XyNdUOQUmnIAcdic39NkbhQ==}
+  /@glimmer/util@0.85.13:
+    resolution: {integrity: sha512-ogj65iukNKEPPqQ2bOD6CLsqxsFwmiGvTQbAsg1eh1MoPjxhNZMpLsT5CdQ10XE7yUALHGJ71SwxBSpAOGDmxg==}
+    dependencies:
+      '@glimmer/env': 0.1.7
+      '@glimmer/interfaces': 0.85.13
+    dev: false
+
+  /@glimmer/validator@0.85.13:
+    resolution: {integrity: sha512-vWSHpYq1gbnssxwyW0t7JrSbfZj8jZUAUdqp9bymHZOgru7QZn0mYCuJbfYDvF9pzsTQ+i0zZBMxZRHeAWbasQ==}
     dependencies:
       '@glimmer/env': 0.1.7
-      '@glimmer/global-context': 0.84.3
+      '@glimmer/global-context': 0.85.13
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/util': 0.85.13
     dev: false
 
-  /@glimmer/vm-babel-plugins@0.84.3(@babel/core@7.23.2):
-    resolution: {integrity: sha512-fucWuuN7Q9QFB0ODd+PCltcTkmH4fLqYyXGArrfLt/TYN8gLv0yo00mPwFOSY7MWti/MUx88xd20/PycvYtg8w==}
+  /@glimmer/vm-babel-plugins@0.85.13(@babel/core@7.23.2):
+    resolution: {integrity: sha512-B5R+t7o0Dlfz7GYu6liQ/GERAq/Fb775KZJeEaIwX2odJDKyIfOU+m/bLHpoVevY4V/x+qB8tVCA4Nv5LXu3Kg==}
+    engines: {node: '>=16'}
     dependencies:
       babel-plugin-debug-macros: 0.3.4(@babel/core@7.23.2)
     transitivePeerDependencies:
       - '@babel/core'
     dev: false
 
-  /@glimmer/vm@0.84.3:
-    resolution: {integrity: sha512-3mBWvQLEbB8We2EwdmuALMT3zQEcE13ItfLJ0wxlSO2uj1uegeHat++mli8RMxeYNqex27DC+VuhHeWVve6Ngg==}
+  /@glimmer/vm@0.85.13:
+    resolution: {integrity: sha512-x/FwTAFnoIzu/TzJYuqWI1rWoIJUthKZ6n37q5Nr8TVoFqOVXk7q9k53etcAhxLEwBjX/cox6i1FxCuv5vpc8Q==}
     dependencies:
-      '@glimmer/interfaces': 0.84.3
-      '@glimmer/util': 0.84.3
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/util': 0.85.13
     dev: false
 
-  /@glimmer/wire-format@0.84.3:
-    resolution: {integrity: sha512-aZVfQhqv4k7tTo2vwjy+b4mAxKt7cHH75JR3zAeCilimApa+yYTYUyY73NDNSUVbelgAlQ5s6vTiMSQ55WwVow==}
+  /@glimmer/wire-format@0.85.13:
+    resolution: {integrity: sha512-q6bHPfjSYE9jH27L75lUzyhSpBA+iONzsJVXewdwO4GdYYCC4s+pfUaJg7ZYNFDcHDuVKUcLhBb/NICDzMA5Uw==}
     dependencies:
-      '@glimmer/interfaces': 0.84.3
-      '@glimmer/util': 0.84.3
+      '@glimmer/interfaces': 0.85.13
+      '@glimmer/util': 0.85.13
     dev: false
 
   /@handlebars/parser@2.0.0:
@@ -2591,7 +2629,7 @@ packages:
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -2669,7 +2707,7 @@ packages:
       typescript:
         optional: true
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       extract-zip: 2.0.1
       progress: 2.0.3
       proxy-agent: 6.3.0
@@ -2687,7 +2725,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
       '@types/babel__core': ^7.1.9
-      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+      rollup: ^4.2.0
     peerDependenciesMeta:
       '@types/babel__core':
         optional: true
@@ -2703,7 +2741,7 @@ packages:
     resolution: {integrity: sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+      rollup: ^4.2.0
     peerDependenciesMeta:
       rollup:
         optional: true
@@ -2713,6 +2751,102 @@ packages:
       picomatch: 2.3.1
     dev: true
 
+  /@rollup/rollup-android-arm-eabi@4.4.1:
+    resolution: {integrity: sha512-Ss4suS/sd+6xLRu+MLCkED2mUrAyqHmmvZB+zpzZ9Znn9S8wCkTQCJaQ8P8aHofnvG5L16u9MVnJjCqioPErwQ==}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-android-arm64@4.4.1:
+    resolution: {integrity: sha512-sRSkGTvGsARwWd7TzC8LKRf8FiPn7257vd/edzmvG4RIr9x68KBN0/Ek48CkuUJ5Pj/Dp9vKWv6PEupjKWjTYA==}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-darwin-arm64@4.4.1:
+    resolution: {integrity: sha512-nz0AiGrrXyaWpsmBXUGOBiRDU0wyfSXbFuF98pPvIO8O6auQsPG6riWsfQqmCCC5FNd8zKQ4JhgugRNAkBJ8mQ==}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-darwin-x64@4.4.1:
+    resolution: {integrity: sha512-Ogqvf4/Ve/faMaiPRvzsJEqajbqs00LO+8vtrPBVvLgdw4wBg6ZDXdkDAZO+4MLnrc8mhGV6VJAzYScZdPLtJg==}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm-gnueabihf@4.4.1:
+    resolution: {integrity: sha512-9zc2tqlr6HfO+hx9+wktUlWTRdje7Ub15iJqKcqg5uJZ+iKqmd2CMxlgPpXi7+bU7bjfDIuvCvnGk7wewFEhCg==}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm64-gnu@4.4.1:
+    resolution: {integrity: sha512-phLb1fN3rq2o1j1v+nKxXUTSJnAhzhU0hLrl7Qzb0fLpwkGMHDem+o6d+ZI8+/BlTXfMU4kVWGvy6g9k/B8L6Q==}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm64-musl@4.4.1:
+    resolution: {integrity: sha512-M2sDtw4tf57VPSjbTAN/lz1doWUqO2CbQuX3L9K6GWIR5uw9j+ROKCvvUNBY8WUbMxwaoc8mH9HmmBKsLht7+w==}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-x64-gnu@4.4.1:
+    resolution: {integrity: sha512-mHIlRLX+hx+30cD6c4BaBOsSqdnCE4ok7/KDvjHYAHoSuveoMMxIisZFvcLhUnyZcPBXDGZTuBoalcuh43UfQQ==}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-x64-musl@4.4.1:
+    resolution: {integrity: sha512-tB+RZuDi3zxFx7vDrjTNGVLu2KNyzYv+UY8jz7e4TMEoAj7iEt8Qk6xVu6mo3pgjnsHj6jnq3uuRsHp97DLwOA==}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-win32-arm64-msvc@4.4.1:
+    resolution: {integrity: sha512-Hdn39PzOQowK/HZzYpCuZdJC91PE6EaGbTe2VCA9oq2u18evkisQfws0Smh9QQGNNRa/T7MOuGNQoLeXhhE3PQ==}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-win32-ia32-msvc@4.4.1:
+    resolution: {integrity: sha512-tLpKb1Elm9fM8c5w3nl4N1eLTP4bCqTYw9tqUBxX8/hsxqHO3dxc2qPbZ9PNkdK4tg4iLEYn0pOUnVByRd2CbA==}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-win32-x64-msvc@4.4.1:
+    resolution: {integrity: sha512-eAhItDX9yQtZVM3yvXS/VR3qPqcnXvnLyx1pLXl4JzyNMBNO3KC986t/iAg2zcMzpAp9JSvxB5VZGnBiNoA98w==}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@simple-dom/document@1.4.0:
     resolution: {integrity: sha512-/RUeVH4kuD3rzo5/91+h4Z1meLSLP66eXqpVAw/4aZmYozkeqUkMprq0znL4psX/adEed5cBgiNJcfMz/eKZLg==}
     dependencies:
@@ -3386,7 +3520,7 @@ packages:
       '@typescript-eslint/scope-manager': 5.62.0
       '@typescript-eslint/type-utils': 5.62.0(eslint@8.51.0)(typescript@5.1.6)
       '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@5.1.6)
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.51.0
       graphemer: 1.4.0
       ignore: 5.2.4
@@ -3411,7 +3545,7 @@ packages:
       '@typescript-eslint/scope-manager': 5.62.0
       '@typescript-eslint/types': 5.62.0
       '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6)
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.51.0
       typescript: 5.1.6
     transitivePeerDependencies:
@@ -3438,7 +3572,7 @@ packages:
     dependencies:
       '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6)
       '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@5.1.6)
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.51.0
       tsutils: 3.21.0(typescript@5.1.6)
       typescript: 5.1.6
@@ -3462,7 +3596,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 5.62.0
       '@typescript-eslint/visitor-keys': 5.62.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
@@ -3525,12 +3659,6 @@ packages:
       acorn: 8.10.0
     dev: true
 
-  /acorn@7.4.1:
-    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: true
-
   /acorn@8.10.0:
     resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
     engines: {node: '>=0.4.0'}
@@ -3548,7 +3676,7 @@ packages:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3557,7 +3685,7 @@ packages:
     resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
     engines: {node: '>= 14'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3953,7 +4081,7 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       fs-extra: 9.1.0
       meow: 9.0.0
       package-json: 6.5.0
@@ -4308,7 +4436,7 @@ packages:
     dev: true
 
   /bower-endpoint-parser@0.2.2:
-    resolution: {integrity: sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=}
+    resolution: {integrity: sha512-YWZHhWkPdXtIfH3VRu3QIV95sa75O9vrQWBOHjexWCLBCTy5qJvRr36LXTqFwTchSXVlzy5piYJOjzHr7qhsNg==}
     engines: {node: '>=0.8.0'}
     dev: true
 
@@ -4521,7 +4649,7 @@ packages:
     dependencies:
       array-equal: 1.0.0
       broccoli-plugin: 4.0.7
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       fs-tree-diff: 2.0.1
       heimdalljs: 0.2.6
       minimatch: 3.1.2
@@ -4700,7 +4828,7 @@ packages:
       heimdalljs-logger: 0.1.10
       magic-string: 0.25.9
       node-modules-path: 1.0.2
-      rollup: 1.32.1
+      rollup: 4.4.1
       symlink-or-copy: 1.3.1
       walk-sync: 0.3.4
     transitivePeerDependencies:
@@ -4734,7 +4862,7 @@ packages:
       broccoli-persistent-filter: 2.3.1
       broccoli-plugin: 2.1.0
       chalk: 2.4.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       ensure-posix-path: 1.1.1
       fs-extra: 8.1.0
       minimatch: 3.1.2
@@ -4778,7 +4906,7 @@ packages:
     dependencies:
       async-promise-queue: 1.0.5
       broccoli-plugin: 4.0.7
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       lodash.defaultsdeep: 4.6.1
       matcher-collection: 2.0.1
       source-map-url: 0.4.1
@@ -5327,7 +5455,7 @@ packages:
     dev: true
 
   /concat-map@0.0.1:
-    resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
   /configstore@5.0.1:
     resolution: {integrity: sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==}
@@ -5558,7 +5686,7 @@ packages:
     resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
 
   /cookie-signature@1.0.6:
-    resolution: {integrity: sha1-4wOogrNCzD7oylE6eZmXNNqzriw=}
+    resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
     dev: true
 
   /cookie@0.4.2:
@@ -5717,17 +5845,6 @@ packages:
       ms: 2.1.3
     dev: true
 
-  /debug@4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-
   /debug@4.3.4(supports-color@8.1.1):
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
@@ -5739,7 +5856,6 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 8.1.1
-    dev: true
 
   /decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
@@ -5951,7 +6067,7 @@ packages:
     engines: {node: '>=0.8'}
 
   /ee-first@1.1.1:
-    resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=}
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
     dev: true
 
   /electron-to-chromium@1.4.557:
@@ -5978,7 +6094,7 @@ packages:
       broccoli-plugin: 4.0.7
       broccoli-source: 3.0.1
       css-loader: 5.2.7
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       fs-extra: 10.1.0
       fs-tree-diff: 2.0.1
       handlebars: 4.7.8
@@ -6048,7 +6164,7 @@ packages:
       chai: 4.3.10
       chai-as-promised: 7.1.1(chai@4.3.10)
       chai-files: 1.4.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       ember-cli-internal-test-helpers: 0.9.1
       fs-extra: 7.0.1
       testdouble: 3.19.0
@@ -6157,7 +6273,7 @@ packages:
     dependencies:
       '@babel/plugin-transform-typescript': 7.5.5(@babel/core@7.23.2)
       ansi-to-html: 0.6.15
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       ember-cli-babel-plugin-helpers: 1.1.1
       execa: 2.1.0
       fs-extra: 8.1.0
@@ -6434,7 +6550,7 @@ packages:
       base64id: 2.0.0
       cookie: 0.4.2
       cors: 2.8.5
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       engine.io-parser: 5.2.1
       ws: 8.11.0
     transitivePeerDependencies:
@@ -6814,7 +6930,7 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -7114,7 +7230,7 @@ packages:
     engines: {node: '>= 10.17.0'}
     hasBin: true
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
@@ -7706,7 +7822,7 @@ packages:
     dependencies:
       basic-ftp: 5.0.3
       data-uri-to-buffer: 6.0.1
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       fs-extra: 8.1.0
     transitivePeerDependencies:
       - supports-color
@@ -8170,7 +8286,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8212,7 +8328,7 @@ packages:
     engines: {node: '>= 6'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8222,7 +8338,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8654,7 +8770,7 @@ packages:
       has-symbols: 1.0.3
 
   /is-type@0.0.1:
-    resolution: {integrity: sha1-9lHYXDZdRJVdFKUdjXBh8/a0d5w=}
+    resolution: {integrity: sha512-YwJh/zBVrcJ90aAnPBM0CbHvm7lG9ao7lIFeqTZ1UQj4iFLpM5CikdaU+dGGesrMJwxLqPGmjjrUrQ6Kn3Zh+w==}
     dependencies:
       core-util-is: 1.0.3
     dev: true
@@ -8763,7 +8879,7 @@ packages:
     hasBin: true
 
   /json-buffer@3.0.0:
-    resolution: {integrity: sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=}
+    resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==}
     dev: true
 
   /json-buffer@3.0.1:
@@ -8885,7 +9001,7 @@ packages:
     dev: true
 
   /leek@0.0.24:
-    resolution: {integrity: sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=}
+    resolution: {integrity: sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ==}
     dependencies:
       debug: 2.6.9
       lodash.assign: 3.2.0
@@ -9281,7 +9397,7 @@ packages:
     dev: true
 
   /media-typer@0.3.0:
-    resolution: {integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=}
+    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
     engines: {node: '>= 0.6'}
     dev: true
 
@@ -9323,7 +9439,7 @@ packages:
     dev: true
 
   /merge-descriptors@1.0.1:
-    resolution: {integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=}
+    resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
     dev: true
 
   /merge-stream@2.0.0:
@@ -10067,7 +10183,7 @@ packages:
     dependencies:
       '@tootallnate/quickjs-emscripten': 0.23.0
       agent-base: 7.1.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       get-uri: 6.0.2
       http-proxy-agent: 7.0.0
       https-proxy-agent: 7.0.2
@@ -10419,7 +10535,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       http-proxy-agent: 7.0.0
       https-proxy-agent: 7.0.2
       lru-cache: 7.18.3
@@ -10470,7 +10586,7 @@ packages:
       '@puppeteer/browsers': 1.4.6(typescript@5.1.6)
       chromium-bidi: 0.4.16(devtools-protocol@0.0.1147663)
       cross-fetch: 4.0.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       devtools-protocol: 0.0.1147663
       typescript: 5.1.6
       ws: 8.13.0
@@ -10962,20 +11078,23 @@ packages:
     dependencies:
       glob: 7.2.3
 
-  /rollup@1.32.1:
-    resolution: {integrity: sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==}
-    hasBin: true
-    dependencies:
-      '@types/estree': 1.0.2
-      '@types/node': 18.18.5
-      acorn: 7.4.1
-    dev: true
-
-  /rollup@3.29.4:
-    resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
+  /rollup@4.4.1:
+    resolution: {integrity: sha512-idZzrUpWSblPJX66i+GzrpjKE3vbYrlWirUHteoAbjKReZwa0cohAErOYA5efoMmNCdvG9yrJS+w9Kl6csaH4w==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
+      '@rollup/rollup-android-arm-eabi': 4.4.1
+      '@rollup/rollup-android-arm64': 4.4.1
+      '@rollup/rollup-darwin-arm64': 4.4.1
+      '@rollup/rollup-darwin-x64': 4.4.1
+      '@rollup/rollup-linux-arm-gnueabihf': 4.4.1
+      '@rollup/rollup-linux-arm64-gnu': 4.4.1
+      '@rollup/rollup-linux-arm64-musl': 4.4.1
+      '@rollup/rollup-linux-x64-gnu': 4.4.1
+      '@rollup/rollup-linux-x64-musl': 4.4.1
+      '@rollup/rollup-win32-arm64-msvc': 4.4.1
+      '@rollup/rollup-win32-ia32-msvc': 4.4.1
+      '@rollup/rollup-win32-x64-msvc': 4.4.1
       fsevents: 2.3.3
     dev: true
 
@@ -11350,7 +11469,7 @@ packages:
     engines: {node: '>=10.0.0'}
     dependencies:
       '@socket.io/component-emitter': 3.1.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -11362,7 +11481,7 @@ packages:
       accepts: 1.3.8
       base64id: 2.0.0
       cors: 2.8.5
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       engine.io: 6.5.3
       socket.io-adapter: 2.5.2
       socket.io-parser: 4.2.4
@@ -11377,7 +11496,7 @@ packages:
     engines: {node: '>= 14'}
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
@@ -11507,7 +11626,7 @@ packages:
     resolution: {integrity: sha512-GqXBq2SPWv9hTXDFKS8WrKK1aISB0aKGHZzH+uD4ShAgs+Fz20ZfoerLOm8U+f62iRWLrw6nimOY/uYuTcVhvg==}
     engines: {node: 6.* || 8.* || >= 10.*}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -11714,7 +11833,7 @@ packages:
     dev: false
 
   /styled_string@0.0.1:
-    resolution: {integrity: sha1-0ieCvYEpVFm8Tx3xjEutjpTdEko=}
+    resolution: {integrity: sha512-DU2KZiB6VbPkO2tGSqQ9n96ZstUPjW7X4sGO6V2m1myIQluX0p1Ol8BrA/l6/EesqhMqXOIXs3cJNOy1UuU2BA==}
     dev: true
 
   /sum-up@1.0.3:
@@ -11751,7 +11870,6 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       has-flag: 4.0.0
-    dev: true
 
   /supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
@@ -12144,7 +12262,7 @@ packages:
     resolution: {integrity: sha512-OLWW+Nd99NOM53aZ8ilT/YpEiOo6mXD3F4/wLbARqybSZ3Jb8IxHK5UGVbZaae0wtXAyQshVV+SeqVBik+Fbmw==}
     engines: {node: '>=8'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@8.1.1)
       fs-tree-diff: 2.0.1
       mkdirp: 0.5.6
       quick-temp: 0.1.8
@@ -12463,7 +12581,7 @@ packages:
     dev: true
 
   /utils-merge@1.0.1:
-    resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=}
+    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
     engines: {node: '>= 0.4.0'}
     dev: true
 
@@ -12532,7 +12650,7 @@ packages:
       '@types/node': 18.18.5
       esbuild: 0.18.20
       postcss: 8.4.31
-      rollup: 3.29.4
+      rollup: 4.4.1
     optionalDependencies:
       fsevents: 2.3.3
     dev: true
@@ -12543,7 +12661,7 @@ packages:
     dependencies:
       glob: 7.2.3
       uuid: 2.0.3
-      vow: 0.4.13
+      vow: 0.4.20
       vow-queue: 0.4.3
     dev: true
 
@@ -12834,7 +12952,7 @@ packages:
       require-directory: 2.1.1
       string-width: 4.2.3
       y18n: 5.0.8
-      yargs-parser: 20.2.4
+      yargs-parser: 20.2.9
     dev: true
 
   /yargs@17.7.1:
@@ -12896,7 +13014,3 @@ packages:
     transitivePeerDependencies:
       - supports-color
     dev: true
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false