Kill Enumerable

wagenet · wagenet · commit f4efabf23a04 · 2025-06-20T06:20:59.000-07:00
diff --git a/broccoli/amd-compat-entrypoints/ember.debug.js b/broccoli/amd-compat-entrypoints/ember.debug.js
@@ -215,12 +215,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);
 
diff --git a/package.json b/package.json
@@ -259,8 +259,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",
diff --git a/packages/@ember/-internals/package.json b/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:*",
diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
@@ -1,9 +1,4 @@
 export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
 export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
-export { default as Comparable } from './lib/mixins/comparable';
-export { default as ActionHandler } from './lib/mixins/action_handler';
-export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
-export { default as MutableEnumerable } from '@ember/enumerable/mutable';
-export { default as TargetActionSupport } from './lib/mixins/target_action_support';
 
 export { default as RSVP, onerrorDefault } from './lib/ext/rsvp'; // just for side effect of extending Ember.RSVP
diff --git a/packages/@ember/array/package.json b/packages/@ember/array/package.json
@@ -13,7 +13,6 @@
     "@ember/-internals": "workspace:*",
     "@ember/application": "workspace:*",
     "@ember/debug": "workspace:*",
-    "@ember/enumerable": "workspace:*",
     "@ember/object": "workspace:*",
     "@ember/runloop": "workspace:*",
     "@ember/utils": "workspace:*",
diff --git a/packages/@ember/debug/package.json b/packages/@ember/debug/package.json
@@ -12,7 +12,6 @@
     "@ember/application": "workspace:*",
     "@ember/array": "workspace:*",
     "@ember/engine": "workspace:*",
-    "@ember/enumerable": "workspace:*",
     "@ember/object": "workspace:*",
     "@ember/owner": "workspace:*",
     "@ember/routing": "workspace:*",
diff --git a/packages/@ember/enumerable/index.ts b/packages/@ember/enumerable/index.ts
diff --git a/packages/@ember/enumerable/mutable.ts b/packages/@ember/enumerable/mutable.ts
diff --git a/packages/@ember/enumerable/package.json b/packages/@ember/enumerable/package.json
diff --git a/packages/@ember/object/package.json b/packages/@ember/object/package.json
@@ -22,7 +22,6 @@
     "@ember/application": "workspace:*",
     "@ember/array": "workspace:*",
     "@ember/debug": "workspace:*",
-    "@ember/enumerable": "workspace:*",
     "@ember/runloop": "workspace:*",
     "@ember/service": "workspace:*",
     "@ember/utils": "workspace:*",
diff --git a/packages/@ember/routing/package.json b/packages/@ember/routing/package.json
@@ -19,7 +19,6 @@
     "@ember/controller": "workspace:*",
     "@ember/debug": "workspace:*",
     "@ember/engine": "workspace:*",
-    "@ember/enumerable": "workspace:*",
     "@ember/object": "workspace:*",
     "@ember/owner": "workspace:*",
     "@ember/runloop": "workspace:*",
diff --git a/packages/@ember/utils/package.json b/packages/@ember/utils/package.json
@@ -10,7 +10,6 @@
     "@ember/application": "workspace:*",
     "@ember/array": "workspace:*",
     "@ember/debug": "workspace:*",
-    "@ember/enumerable": "workspace:*",
     "@ember/object": "workspace:*",
     "@ember/runloop": "workspace:*",
     "@glimmer/destroyable": "0.94.8",
diff --git a/packages/@ember/version/package.json b/packages/@ember/version/package.json
@@ -15,7 +15,6 @@
     "@ember/debug": "workspace:*",
     "@ember/destroyable": "workspace:*",
     "@ember/engine": "workspace:*",
-    "@ember/enumerable": "workspace:*",
     "@ember/instrumentation": "workspace:*",
     "@ember/object": "workspace:*",
     "@ember/routing": "workspace:*",
diff --git a/packages/ember-template-compiler/package.json b/packages/ember-template-compiler/package.json
@@ -17,7 +17,6 @@
     "@ember/debug": "workspace:*",
     "@ember/destroyable": "workspace:*",
     "@ember/engine": "workspace:*",
-    "@ember/enumerable": "workspace:*",
     "@ember/instrumentation": "workspace:*",
     "@ember/object": "workspace:*",
     "@ember/routing": "workspace:*",
diff --git a/packages/ember/barrel.ts b/packages/ember/barrel.ts
@@ -85,8 +85,6 @@ import EmberComponent, { Input as EmberInput } from '@ember/component';
 import EmberHelper from '@ember/component/helper';
 import EmberEngine from '@ember/engine';
 import EmberEngineInstance from '@ember/engine/instance';
-import EmberEnumerable from '@ember/enumerable';
-import EmberMutableEnumerable from '@ember/enumerable/mutable';
 import EmberCoreObject from '@ember/object/core';
 import EmberEvented, { on as emberOn } from '@ember/object/evented';
 import EmberMixin, { mixin as emberMixin } from '@ember/object/mixin';
@@ -294,14 +292,6 @@ namespace Ember {
   export const EngineInstance = EmberEngineInstance;
   export type EngineInstance = EmberEngineInstance;
 
-  // ****@ember/enumerable****
-  export const Enumerable = EmberEnumerable;
-  export type Enumerable = EmberEnumerable;
-
-  // ****@ember/enumerable/mutable****
-  export const MutableEnumerable = EmberMutableEnumerable;
-  export type MutableEnumerable = EmberMutableEnumerable;
-
   // ****@ember/instrumentation****
   /** @private */
   export const instrument = instrumentation.instrument;
diff --git a/packages/ember/package.json b/packages/ember/package.json
@@ -16,7 +16,6 @@
     "@ember/debug": "workspace:*",
     "@ember/destroyable": "workspace:*",
     "@ember/engine": "workspace:*",
-    "@ember/enumerable": "workspace:*",
     "@ember/helper": "workspace:*",
     "@ember/instrumentation": "workspace:*",
     "@ember/modifier": "workspace:*",
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
@@ -72,7 +72,6 @@ import * as test13 from '@ember/debug/data-adapter';
 import * as test14 from '@ember/destroyable';
 import * as test15 from '@ember/engine';
 import * as test16 from '@ember/engine/instance';
-import * as test17 from '@ember/enumerable';
 import * as test18 from '@ember/instrumentation';
 import * as test19 from '@ember/modifier';
 import * as test20 from '@ember/helper';
@@ -179,7 +178,6 @@ let allExports = [
   ['_unregisterDestructor', '@ember/destroyable', 'unregisterDestructor', test14],
   ['Engine', '@ember/engine', 'default', test15],
   ['EngineInstance', '@ember/engine/instance', 'default', test16],
-  ['Enumerable', '@ember/enumerable', 'default', test17],
   ['instrument', '@ember/instrumentation', 'instrument', test18],
   ['subscribe', '@ember/instrumentation', 'subscribe', test18],
   ['Instrumentation.instrument', '@ember/instrumentation', 'instrument', test18],
@@ -341,10 +339,6 @@ let allExports = [
   ['_Input', '@ember/-internals/glimmer', 'Input', test56],
   ['_RegistryProxyMixin', '@ember/-internals/runtime', 'RegistryProxyMixin', test57],
   ['_ContainerProxyMixin', '@ember/-internals/runtime', 'ContainerProxyMixin', test57],
-  ['Comparable', '@ember/-internals/runtime', null, test57],
-  ['ActionHandler', '@ember/-internals/runtime', null, test57],
-  ['MutableEnumerable', '@ember/-internals/runtime', null, test57],
-  ['_ProxyMixin', '@ember/-internals/runtime', null, test57],
   ['controllerFor', '@ember/-internals/routing', null, test58],
   ['generateControllerFactory', '@ember/-internals/routing', null, test58],
   ['generateController', '@ember/-internals/routing', null, test58],
diff --git a/packages/internal-test-helpers/package.json b/packages/internal-test-helpers/package.json
@@ -16,7 +16,6 @@
     "@ember/debug": "workspace:*",
     "@ember/destroyable": "workspace:*",
     "@ember/engine": "workspace:*",
-    "@ember/enumerable": "workspace:*",
     "@ember/instrumentation": "workspace:*",
     "@ember/object": "workspace:*",
     "@ember/owner": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
