[Next] Kill even more mixins

broccoli/amd-compat-entrypoints/ember.debug.js

@@ -56,18 +56,6 @@ d('@ember/-internals/runtime/index', emberinternalsRuntimeIndex);
 import * as emberinternalsRuntimeLibExtRsvp from '@ember/-internals/runtime/lib/ext/rsvp';
 d('@ember/-internals/runtime/lib/ext/rsvp', emberinternalsRuntimeLibExtRsvp);
 
-import * as emberinternalsRuntimeLibMixinsContainerProxy from '@ember/-internals/runtime/lib/mixins/container_proxy';
-d(
-  '@ember/-internals/runtime/lib/mixins/container_proxy',
-  emberinternalsRuntimeLibMixinsContainerProxy
-);
-
-import * as emberinternalsRuntimeLibMixinsRegistryProxy from '@ember/-internals/runtime/lib/mixins/registry_proxy';
-d(
-  '@ember/-internals/runtime/lib/mixins/registry_proxy',
-  emberinternalsRuntimeLibMixinsRegistryProxy
-);
-
 import * as emberinternalsStringIndex from '@ember/-internals/string/index';
 d('@ember/-internals/string/index', emberinternalsStringIndex);
 
@@ -185,12 +173,6 @@ d('@ember/engine/instance', emberEngineInstance);
 import * as emberEngineLibEngineParent from '@ember/engine/lib/engine-parent';
 d('@ember/engine/lib/engine-parent', emberEngineLibEngineParent);
 
-import * as emberEnumerableIndex from '@ember/enumerable/index';
-d('@ember/enumerable/index', emberEnumerableIndex);
-
-import * as emberEnumerableMutable from '@ember/enumerable/mutable';
-d('@ember/enumerable/mutable', emberEnumerableMutable);
-
 import * as emberHelperIndex from '@ember/helper/index';
 d('@ember/helper/index', emberHelperIndex);
 
@@ -227,9 +209,6 @@ d('@ember/object/lib/computed/computed_macros', emberObjectLibComputedComputedMa
 import * as emberObjectMixin from '@ember/object/mixin';
 d('@ember/object/mixin', emberObjectMixin);
 
-import * as emberObjectObservable from '@ember/object/observable';
-d('@ember/object/observable', emberObjectObservable);
-
 import * as emberObjectObservers from '@ember/object/observers';
 d('@ember/object/observers', emberObjectObservers);
 

package.json

@@ -205,8 +205,6 @@
       "@ember/-internals/routing/index.js": "ember-source/@ember/-internals/routing/index.js",
       "@ember/-internals/runtime/index.js": "ember-source/@ember/-internals/runtime/index.js",
       "@ember/-internals/runtime/lib/ext/rsvp.js": "ember-source/@ember/-internals/runtime/lib/ext/rsvp.js",
-      "@ember/-internals/runtime/lib/mixins/container_proxy.js": "ember-source/@ember/-internals/runtime/lib/mixins/container_proxy.js",
-      "@ember/-internals/runtime/lib/mixins/registry_proxy.js": "ember-source/@ember/-internals/runtime/lib/mixins/registry_proxy.js",
       "@ember/-internals/string/index.js": "ember-source/@ember/-internals/string/index.js",
       "@ember/-internals/utility-types/index.js": "ember-source/@ember/-internals/utility-types/index.js",
       "@ember/-internals/utils/index.js": "ember-source/@ember/-internals/utils/index.js",
@@ -247,8 +245,6 @@
       "@ember/engine/instance.js": "ember-source/@ember/engine/instance.js",
       "@ember/engine/lib/engine-parent.js": "ember-source/@ember/engine/lib/engine-parent.js",
       "@ember/engine/parent.js": "ember-source/@ember/engine/parent.js",
-      "@ember/enumerable/index.js": "ember-source/@ember/enumerable/index.js",
-      "@ember/enumerable/mutable.js": "ember-source/@ember/enumerable/mutable.js",
       "@ember/helper/index.js": "ember-source/@ember/helper/index.js",
       "@ember/instrumentation/index.js": "ember-source/@ember/instrumentation/index.js",
       "@ember/modifier/index.js": "ember-source/@ember/modifier/index.js",
@@ -263,7 +259,6 @@
       "@ember/object/lib/computed/computed_macros.js": "ember-source/@ember/object/lib/computed/computed_macros.js",
       "@ember/object/lib/computed/reduce_computed_macros.js": "ember-source/@ember/object/lib/computed/reduce_computed_macros.js",
       "@ember/object/mixin.js": "ember-source/@ember/object/mixin.js",
-      "@ember/object/observable.js": "ember-source/@ember/object/observable.js",
       "@ember/object/observers.js": "ember-source/@ember/object/observers.js",
       "@ember/owner/index.js": "ember-source/@ember/owner/index.js",
       "@ember/renderer/index.js": "ember-source/@ember/renderer/index.js",

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

@@ -59,150 +59,6 @@ function matches(el: Element, selector: string): boolean {
 @module @ember/component
 */
 
-interface ComponentMethods {
-  // Overrideable methods are defined here since you can't `declare` a method in a class
-
-  /**
-   Called when the attributes passed into the component have been updated.
-    Called both during the initial render of a container and during a rerender.
-    Can be used in place of an observer; code placed here will be executed
-    every time any attribute updates.
-    @method didReceiveAttrs
-    @public
-    @since 1.13.0
-    */
-  didReceiveAttrs(): void;
-
-  /**
-   Called when the attributes passed into the component have been updated.
-    Called both during the initial render of a container and during a rerender.
-    Can be used in place of an observer; code placed here will be executed
-    every time any attribute updates.
-    @event didReceiveAttrs
-    @public
-    @since 1.13.0
-    */
-
-  /**
-   Called after a component has been rendered, both on initial render and
-    in subsequent rerenders.
-    @method didRender
-    @public
-    @since 1.13.0
-    */
-  didRender(): void;
-
-  /**
-   Called after a component has been rendered, both on initial render and
-    in subsequent rerenders.
-    @event didRender
-    @public
-    @since 1.13.0
-    */
-
-  /**
-   Called before a component has been rendered, both on initial render and
-    in subsequent rerenders.
-    @method willRender
-    @public
-    @since 1.13.0
-    */
-  willRender(): void;
-
-  /**
-   Called before a component has been rendered, both on initial render and
-    in subsequent rerenders.
-    @event willRender
-    @public
-    @since 1.13.0
-    */
-
-  /**
-   Called when the attributes passed into the component have been changed.
-    Called only during a rerender, not during an initial render.
-    @method didUpdateAttrs
-    @public
-    @since 1.13.0
-    */
-  didUpdateAttrs(): void;
-
-  /**
-   Called when the attributes passed into the component have been changed.
-    Called only during a rerender, not during an initial render.
-    @event didUpdateAttrs
-    @public
-    @since 1.13.0
-    */
-
-  /**
-   Called when the component is about to update and rerender itself.
-    Called only during a rerender, not during an initial render.
-    @method willUpdate
-    @public
-    @since 1.13.0
-    */
-  willUpdate(): void;
-
-  /**
-   Called when the component is about to update and rerender itself.
-    Called only during a rerender, not during an initial render.
-    @event willUpdate
-    @public
-    @since 1.13.0
-    */
-
-  /**
-   Called when the component has updated and rerendered itself.
-    Called only during a rerender, not during an initial render.
-    @method didUpdate
-    @public
-    @since 1.13.0
-    */
-  didUpdate(): void;
-
-  /**
-   Called when the component has updated and rerendered itself.
-    Called only during a rerender, not during an initial render.
-    @event didUpdate
-    @public
-    @since 1.13.0
-    */
-
-  /**
-    The HTML `id` of the component's element in the DOM. You can provide this
-    value yourself but it must be unique (just as in HTML):
-
-    ```handlebars
-    {{my-component elementId="a-really-cool-id"}}
-    ```
-
-    ```handlebars
-    <MyComponent @elementId="a-really-cool-id" />
-    ```
-    If not manually set a default value will be provided by the framework.
-    Once rendered an element's `elementId` is considered immutable and you
-    should never change it. If you need to compute a dynamic value for the
-    `elementId`, you should do this when the component or element is being
-    instantiated:
-
-    ```javascript
-    export default class extends Component {
-      init() {
-        super.init(...arguments);
-
-        var index = this.get('index');
-        this.set('elementId', `component-id${index}`);
-      }
-    }
-    ```
-
-    @property elementId
-    @type String
-    @public
-  */
-  layoutName?: string;
-}
-
 // A zero-runtime-overhead private symbol to use in branding the component to
 // preserve its type parameter.
 declare const SIGNATURE: unique symbol;
@@ -789,28 +645,12 @@ declare const SIGNATURE: unique symbol;
   @extends Ember.CoreView
   @public
 */
-// This type param is used in the class, so must appear here.
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-interface Component<S = unknown> extends CoreView, ComponentMethods {}
-
 class Component<S = unknown>
-  extends CoreView.extend(
-    {
-      // These need to be overridable via extend/create but should still
-      // have a default. Defining them here is the best way to achieve that.
-      didReceiveAttrs() {},
-      didRender() {},
-      didUpdate() {},
-      didUpdateAttrs() {},
-      willRender() {},
-      willUpdate() {},
-    } as ComponentMethods,
-    {
-      concatenatedProperties: ['attributeBindings', 'classNames', 'classNameBindings'],
-      classNames: EMPTY_ARRAY,
-      classNameBindings: EMPTY_ARRAY,
-    }
-  )
+  extends CoreView.extend({
+    concatenatedProperties: ['attributeBindings', 'classNames', 'classNameBindings'],
+    classNames: EMPTY_ARRAY,
+    classNameBindings: EMPTY_ARRAY,
+  })
   implements PropertyDidChange
 {
   isComponent = true;
@@ -1657,6 +1497,98 @@ class Component<S = unknown>
 
   // End ViewMixin
 
+  // Begin lifecycle hooks
+
+  /**
+   Called when the attributes passed into the component have been updated.
+   Called both during the initial render of a container and during a rerender.
+   Can be used in place of an observer; code placed here will be executed
+   every time any attribute updates.
+   @method didReceiveAttrs
+   @public
+   @since 1.13.0
+  */
+  didReceiveAttrs(): void {}
+
+  /**
+   Called after a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @method didRender
+    @public
+    @since 1.13.0
+    */
+  didRender(): void {}
+
+  /**
+   Called after a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @event didRender
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called before a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @method willRender
+    @public
+    @since 1.13.0
+    */
+  willRender(): void {}
+
+  /**
+   Called before a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @event willRender
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called when the attributes passed into the component have been changed.
+    Called only during a rerender, not during an initial render.
+    @method didUpdateAttrs
+    @public
+    @since 1.13.0
+    */
+  didUpdateAttrs(): void {}
+
+  /**
+   Called when the attributes passed into the component have been changed.
+    Called only during a rerender, not during an initial render.
+    @event didUpdateAttrs
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called when the component is about to update and rerender itself.
+    Called only during a rerender, not during an initial render.
+    @method willUpdate
+    @public
+    @since 1.13.0
+    */
+  willUpdate(): void {}
+
+  /**
+   Called when the component is about to update and rerender itself.
+    Called only during a rerender, not during an initial render.
+    @event willUpdate
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called when the component has updated and rerendered itself.
+    Called only during a rerender, not during an initial render.
+    @method didUpdate
+    @public
+    @since 1.13.0
+    */
+  didUpdate(): void {}
+
+  // End lifecycle hooks
+
   static isComponentFactory = true;
 
   static toString() {

packages/@ember/-internals/package.json

@@ -29,7 +29,6 @@
     "@ember/debug": "workspace:*",
     "@ember/destroyable": "workspace:*",
     "@ember/engine": "workspace:*",
-    "@ember/enumerable": "workspace:*",
     "@ember/helper": "workspace:*",
     "@ember/instrumentation": "workspace:*",
     "@ember/modifier": "workspace:*",

packages/@ember/-internals/runtime/index.ts

@@ -1,5 +1 @@
-export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
-export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
-export { default as MutableEnumerable } from '@ember/enumerable/mutable';
-
 export { default as RSVP, onerrorDefault } from './lib/ext/rsvp'; // just for side effect of extending Ember.RSVP