Merge pull request #21462 from emberjs/nvp/cleanup-3

Refactor so that small apps don't pull in the old renderer as well as some classic things

Author: NullVoxPopuli

packages/@ember/-internals/glimmer/lib/base-renderer.ts

@@ -0,0 +1,11 @@
+/**
+ * The brand for the curly component manager lives in its own module so that
+ * code which only needs to *detect* the curly manager (e.g. the resolver)
+ * does not have to import the manager itself (and with it the classic
+ * component machinery).
+ */
+export const CURLY_MANAGER_BRAND: unique symbol = Symbol('CURLY_MANAGER_BRAND');
+
+export function isCurlyManager(manager: object): boolean {
+  return (manager as any)[CURLY_MANAGER_BRAND] === true;
+}

packages/@ember/-internals/glimmer/lib/component-managers/curly-brand.ts

@@ -60,6 +60,7 @@ import {
 
 import ComponentStateBucket from '../utils/curly-component-state-bucket';
 import { processComponentArgs } from '../utils/process-args';
+import { CURLY_MANAGER_BRAND } from './curly-brand';
 
 const COMPONENT_ARGS_MAP = new WeakMap<object, CapturedArguments['named']>();
 
@@ -139,6 +140,8 @@ export default class CurlyComponentManager
     WithDynamicLayout<ComponentStateBucket, RuntimeResolver>,
     WithDynamicTagName<ComponentStateBucket>
 {
+  readonly [CURLY_MANAGER_BRAND] = true;
+
   protected templateFor(component: Component): CompilableProgram | null {
     let { layout, layoutName } = component;
     let owner = getOwner(component);
@@ -559,8 +562,6 @@ const CURLY_CAPABILITIES: InternalComponentCapabilities = {
   hasSubOwner: false,
 };
 
-export const CURLY_COMPONENT_MANAGER = new CurlyComponentManager();
+export const CURLY_COMPONENT_MANAGER = /*@__PURE__*/ new CurlyComponentManager();
 
-export function isCurlyManager(manager: object): boolean {
-  return manager === CURLY_COMPONENT_MANAGER;
-}
+export { isCurlyManager } from './curly-brand';

packages/@ember/-internals/glimmer/lib/component-managers/curly.ts

@@ -166,7 +166,7 @@ class MountManager
   }
 }
 
-const MOUNT_MANAGER = new MountManager();
+const MOUNT_MANAGER = /*@__PURE__*/ new MountManager();
 
 export class MountDefinition implements ComponentDefinition {
   // handle is not used by this custom definition

packages/@ember/-internals/glimmer/lib/component-managers/mount.ts

@@ -61,7 +61,7 @@ const CAPABILITIES: InternalComponentCapabilities = {
   hasSubOwner: false,
 };
 
-const CAPABILITIES_MASK = capabilityFlagsFrom(CAPABILITIES);
+const CAPABILITIES_MASK = /*@__PURE__*/ capabilityFlagsFrom(CAPABILITIES);
 
 class OutletComponentManager
   implements
@@ -169,7 +169,7 @@ class OutletComponentManager
   }
 }
 
-const OUTLET_MANAGER = new OutletComponentManager();
+const OUTLET_MANAGER = /*@__PURE__*/ new OutletComponentManager();
 
 const OUTLET_COMPONENT_TEMPLATE = precompileTemplate(
   '<@Component @controller={{@controller}} @model={{@model}} />',

packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts

@@ -46,7 +46,7 @@ const CAPABILITIES: InternalComponentCapabilities = {
   hasSubOwner: false,
 };
 
-const CAPABILITIES_MASK = capabilityFlagsFrom(CAPABILITIES);
+const CAPABILITIES_MASK = /*@__PURE__*/ capabilityFlagsFrom(CAPABILITIES);
 
 class RouteTemplateManager
   implements
@@ -108,7 +108,7 @@ class RouteTemplateManager
   }
 }
 
-const ROUTE_TEMPLATE_MANAGER = new RouteTemplateManager();
+const ROUTE_TEMPLATE_MANAGER = /*@__PURE__*/ new RouteTemplateManager();
 
 /**
  * This "upgrades" a route template into a invocable component. Conceptually

packages/@ember/-internals/glimmer/lib/component-managers/route-template.ts

@@ -0,0 +1,11 @@
+/**
+ * The brand for classic (class-based) helpers lives in its own module so that
+ * code which only needs to *detect* classic helpers (e.g. the resolver) does
+ * not have to import the classic `Helper` base class (and with it the classic
+ * object model: `EmberObject`, `Mixin`, meta, etc.).
+ */
+export const IS_CLASSIC_HELPER: unique symbol = Symbol('IS_CLASSIC_HELPER');
+
+export function isClassicHelper(obj: object): boolean {
+  return (obj as any)[IS_CLASSIC_HELPER] === true;
+}

packages/@ember/-internals/glimmer/lib/helper-brand.ts

@@ -10,12 +10,14 @@ import getDebugName from '@ember/-internals/utils/lib/get-debug-name';
 import { assert } from '@ember/debug';
 import { join } from '@ember/runloop';
 import type { Arguments, HelperManager } from '@glimmer/interfaces';
-import { getInternalHelperManager } from '@glimmer/manager/lib/internal/api';
 import { helperCapabilities } from '@glimmer/manager/lib/public/helper';
 import { setHelperManager } from '@glimmer/manager/lib/public/api';
 import type { DirtyableTag } from '@glimmer/interfaces';
 import { consumeTag } from '@glimmer/validator/lib/tracking';
 import { createTag, DIRTY_TAG as dirtyTag } from '@glimmer/validator/lib/validators';
+import { IS_CLASSIC_HELPER } from './helper-brand';
+
+export { isClassicHelper } from './helper-brand';
 
 const RECOMPUTE_TAG = Symbol('RECOMPUTE_TAG');
 
@@ -44,8 +46,6 @@ export interface HelperInstance<S> {
   [RECOMPUTE_TAG]: DirtyableTag;
 }
 
-const IS_CLASSIC_HELPER: unique symbol = Symbol('IS_CLASSIC_HELPER');
-
 export interface SimpleHelper<S> {
   compute: (positional: Positional<S>, named: Named<S>) => Return<S>;
 }
@@ -60,15 +60,15 @@ declare const SIGNATURE: unique symbol;
 
   ```app/templates/application.gjs
   import Cost from '../components/cost';
-    
+
   <template>
     <Cost @cents={{230}} />
   </template>
   ```
 
   ```app/components/cost.gjs
   import formatCurrency from '../helpers/format-currency';
-    
+
   <template>
     <div>{{formatCurrency @cents currency="$"}}</div>
   </template>
@@ -193,10 +193,6 @@ export default class Helper<S = unknown> extends FrameworkObject {
 }
 /* eslint-enable import/export */
 
-export function isClassicHelper(obj: object): boolean {
-  return (obj as any)[IS_CLASSIC_HELPER] === true;
-}
-
 interface ClassicHelperStateBucket {
   instance: HelperInstance<unknown>;
   args: Arguments;
@@ -273,8 +269,6 @@ setHelperManager((owner: InternalOwner | undefined): ClassicHelperManager => {
   return new ClassicHelperManager(owner);
 }, Helper);
 
-export const CLASSIC_HELPER_MANAGER = getInternalHelperManager(Helper);
-
 ///////////
 
 class Wrapper<S = unknown> implements HelperFactory<SimpleHelper<S>> {