Skip to content

[DO NOT MERGE] the delta between main and what we're experimenting with that needs a bunch of RFCs first #20923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 30 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f24d840
Run CI on next
wagenet Jun 10, 2025
2c64b52
Merge remote-tracking branch 'origin/main' into next
wagenet Jun 10, 2025
16e8ed7
Kill Evented
wagenet Jun 6, 2025
9d26e9e
Merge pull request #20917 from wagenet/kill-evented
wagenet Jun 10, 2025
03416b1
Kill ArrayProxy, ObjectProxy, and PromiseProxy
wagenet Jun 7, 2025
14dd191
Merge pull request #20918 from wagenet/kill-proxy
wagenet Jun 10, 2025
f388229
Kill Comparable
wagenet Jun 7, 2025
c902478
Merge pull request #20924 from wagenet/kill-comparable
wagenet Jun 10, 2025
e0e4332
Kill ChildViewsSupport mixin
wagenet Jun 7, 2025
4b0041d
Kill ClassNamesSupport
wagenet Jun 10, 2025
75427e7
Kill ViewStateSupport mixin
wagenet Jun 8, 2025
e3b123c
Kill ViewMixin
wagenet Jun 9, 2025
f0691a7
Fix TS 5.0
wagenet Jun 11, 2025
f74a525
Merge pull request #20925 from wagenet/kill-view-mixins
wagenet Jun 11, 2025
e7291d5
Kill ActionHandler mixin
wagenet Jun 7, 2025
a6760ec
Kill TargetActionSupport
wagenet Jun 7, 2025
6d514d5
Merge pull request #20919 from wagenet/kill-more-mixins
wagenet Jun 11, 2025
1fa44dc
Kill Array mixins, some computed macros
wagenet Jun 10, 2025
251eae8
Kill ObservableMixin, EmberObject no longer uses mixins!
wagenet Jun 9, 2025
4c16999
Kill ControllerMixin
wagenet Jun 9, 2025
62fd793
Inline lifecycle methods
wagenet Jun 10, 2025
3e644c9
Kill Enumerable
wagenet Jun 11, 2025
545f883
Kill ContainerProxyMixin
wagenet Jun 11, 2025
e62120a
Merge pull request #20921 from wagenet/kill-array-mixins
wagenet Jun 11, 2025
990fb41
Kill RegistryProxy Mixin
wagenet Jun 11, 2025
c4ac932
Merge remote-tracking branch 'origin/main' into next
wagenet Jun 11, 2025
5f6dc83
Don't attempt to publish next branch to s3
wagenet Jun 11, 2025
ab874bc
Merge pull request #20928 from emberjs/kill-even-more-mixins
wagenet Jun 11, 2025
9b48198
Merge pull request #20930 from emberjs/main
kategengler Jun 12, 2025
362f70c
Merge pull request #20934 from emberjs/main
wagenet Jun 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- main
- beta
- release
- next
# release branches
- release*
- lts*
Expand Down Expand Up @@ -238,8 +239,8 @@ jobs:
blueprint-test,
browser-test,
]
# Only run on pushes to branches that are not from the cron workflow
if: github.event_name == 'push' && contains(github.ref, 'cron') != true
# Only run on pushes to branches that are not from the cron workflow or the next branch
if: github.event_name == 'push' && contains(github.ref, 'cron') != true && contains(github.ref, 'next') != true
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
Expand Down
63 changes: 0 additions & 63 deletions broccoli/amd-compat-entrypoints/ember.debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,36 +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 emberinternalsRuntimeLibMixinsproxy from '@ember/-internals/runtime/lib/mixins/-proxy';
d('@ember/-internals/runtime/lib/mixins/-proxy', emberinternalsRuntimeLibMixinsproxy);

import * as emberinternalsRuntimeLibMixinsActionHandler from '@ember/-internals/runtime/lib/mixins/action_handler';
d(
'@ember/-internals/runtime/lib/mixins/action_handler',
emberinternalsRuntimeLibMixinsActionHandler
);

import * as emberinternalsRuntimeLibMixinsComparable from '@ember/-internals/runtime/lib/mixins/comparable';
d('@ember/-internals/runtime/lib/mixins/comparable', emberinternalsRuntimeLibMixinsComparable);

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 emberinternalsRuntimeLibMixinsTargetActionSupport from '@ember/-internals/runtime/lib/mixins/target_action_support';
d(
'@ember/-internals/runtime/lib/mixins/target_action_support',
emberinternalsRuntimeLibMixinsTargetActionSupport
);

import * as emberinternalsStringIndex from '@ember/-internals/string/index';
d('@ember/-internals/string/index', emberinternalsStringIndex);

Expand All @@ -110,9 +80,6 @@ d(
import * as emberinternalsViewsLibComponentLookup from '@ember/-internals/views/lib/component_lookup';
d('@ember/-internals/views/lib/component_lookup', emberinternalsViewsLibComponentLookup);

import * as emberinternalsViewsLibMixinsActionSupport from '@ember/-internals/views/lib/mixins/action_support';
d('@ember/-internals/views/lib/mixins/action_support', emberinternalsViewsLibMixinsActionSupport);

import * as emberinternalsViewsLibSystemActionManager from '@ember/-internals/views/lib/system/action_manager';
d('@ember/-internals/views/lib/system/action_manager', emberinternalsViewsLibSystemActionManager);

Expand Down Expand Up @@ -143,21 +110,12 @@ d('@ember/application/lib/lazy_load', emberApplicationLibLazyLoad);
import * as emberApplicationNamespace from '@ember/application/namespace';
d('@ember/application/namespace', emberApplicationNamespace);

import * as emberArrayinternals from '@ember/array/-internals';
d('@ember/array/-internals', emberArrayinternals);

import * as emberArrayIndex from '@ember/array/index';
d('@ember/array/index', emberArrayIndex);

import * as emberArrayLibMakeArray from '@ember/array/lib/make-array';
d('@ember/array/lib/make-array', emberArrayLibMakeArray);

import * as emberArrayMutable from '@ember/array/mutable';
d('@ember/array/mutable', emberArrayMutable);

import * as emberArrayProxy from '@ember/array/proxy';
d('@ember/array/proxy', emberArrayProxy);

import * as emberCanaryFeaturesIndex from '@ember/canary-features/index';
d('@ember/canary-features/index', emberCanaryFeaturesIndex);

Expand Down Expand Up @@ -215,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);

Expand All @@ -242,9 +194,6 @@ d('@ember/object/computed', emberObjectComputed);
import * as emberObjectCore from '@ember/object/core';
d('@ember/object/core', emberObjectCore);

import * as emberObjectEvented from '@ember/object/evented';
d('@ember/object/evented', emberObjectEvented);

import * as emberObjectEvents from '@ember/object/events';
d('@ember/object/events', emberObjectEvents);

Expand All @@ -257,24 +206,12 @@ d('@ember/object/internals', emberObjectInternals);
import * as emberObjectLibComputedComputedMacros from '@ember/object/lib/computed/computed_macros';
d('@ember/object/lib/computed/computed_macros', emberObjectLibComputedComputedMacros);

import * as emberObjectLibComputedReduceComputedMacros from '@ember/object/lib/computed/reduce_computed_macros';
d('@ember/object/lib/computed/reduce_computed_macros', emberObjectLibComputedReduceComputedMacros);

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);

import * as emberObjectPromiseProxyMixin from '@ember/object/promise-proxy-mixin';
d('@ember/object/promise-proxy-mixin', emberObjectPromiseProxyMixin);

import * as emberObjectProxy from '@ember/object/proxy';
d('@ember/object/proxy', emberObjectProxy);

import * as emberOwnerIndex from '@ember/owner/index';
d('@ember/owner/index', emberOwnerIndex);

Expand Down
23 changes: 5 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,14 @@
"ember-cli-typescript-blueprint-polyfill": "^0.1.0",
"ember-cli-version-checker": "^5.1.2",
"ember-router-generator": "^2.0.0",
"ember-tracked-storage-polyfill": "^1.0.0",
"inflection": "^2.0.1",
"route-recognizer": "^0.3.4",
"router_js": "^8.0.5",
"semver": "^7.5.2",
"silent-error": "^1.1.1",
"simple-html-tokenizer": "^0.5.11"
"simple-html-tokenizer": "^0.5.11",
"tracked-built-ins": "^4.0.0"
},
"devDependencies": {
"@aws-sdk/client-s3": "^3.731.0",
Expand Down Expand Up @@ -209,20 +211,13 @@
"@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/-proxy.js": "ember-source/@ember/-internals/runtime/lib/mixins/-proxy.js",
"@ember/-internals/runtime/lib/mixins/action_handler.js": "ember-source/@ember/-internals/runtime/lib/mixins/action_handler.js",
"@ember/-internals/runtime/lib/mixins/comparable.js": "ember-source/@ember/-internals/runtime/lib/mixins/comparable.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/runtime/lib/mixins/target_action_support.js": "ember-source/@ember/-internals/runtime/lib/mixins/target_action_support.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",
"@ember/-internals/views/index.js": "ember-source/@ember/-internals/views/index.js",
"@ember/-internals/views/lib/compat/attrs.js": "ember-source/@ember/-internals/views/lib/compat/attrs.js",
"@ember/-internals/views/lib/compat/fallback-view-registry.js": "ember-source/@ember/-internals/views/lib/compat/fallback-view-registry.js",
"@ember/-internals/views/lib/component_lookup.js": "ember-source/@ember/-internals/views/lib/component_lookup.js",
"@ember/-internals/views/lib/mixins/action_support.js": "ember-source/@ember/-internals/views/lib/mixins/action_support.js",
"@ember/-internals/views/lib/system/action_manager.js": "ember-source/@ember/-internals/views/lib/system/action_manager.js",
"@ember/-internals/views/lib/system/event_dispatcher.js": "ember-source/@ember/-internals/views/lib/system/event_dispatcher.js",
"@ember/-internals/views/lib/system/utils.js": "ember-source/@ember/-internals/views/lib/system/utils.js",
Expand All @@ -232,12 +227,9 @@
"@ember/application/instance.js": "ember-source/@ember/application/instance.js",
"@ember/application/lib/lazy_load.js": "ember-source/@ember/application/lib/lazy_load.js",
"@ember/application/namespace.js": "ember-source/@ember/application/namespace.js",
"@ember/array/-internals.js": "ember-source/@ember/array/-internals.js",
"@ember/array/index.js": "ember-source/@ember/array/index.js",
"@ember/array/lib/make-array.js": "ember-source/@ember/array/lib/make-array.js",
"@ember/array/make.js": "ember-source/@ember/array/make.js",
"@ember/array/mutable.js": "ember-source/@ember/array/mutable.js",
"@ember/array/proxy.js": "ember-source/@ember/array/proxy.js",
"@ember/canary-features/index.js": "ember-source/@ember/canary-features/index.js",
"@ember/component/helper.js": "ember-source/@ember/component/helper.js",
"@ember/component/index.js": "ember-source/@ember/component/index.js",
Expand All @@ -259,8 +251,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",
Expand All @@ -269,17 +259,13 @@
"@ember/object/compat.js": "ember-source/@ember/object/compat.js",
"@ember/object/computed.js": "ember-source/@ember/object/computed.js",
"@ember/object/core.js": "ember-source/@ember/object/core.js",
"@ember/object/evented.js": "ember-source/@ember/object/evented.js",
"@ember/object/events.js": "ember-source/@ember/object/events.js",
"@ember/object/index.js": "ember-source/@ember/object/index.js",
"@ember/object/internals.js": "ember-source/@ember/object/internals.js",
"@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/object/promise-proxy-mixin.js": "ember-source/@ember/object/promise-proxy-mixin.js",
"@ember/object/proxy.js": "ember-source/@ember/object/proxy.js",
"@ember/owner/index.js": "ember-source/@ember/owner/index.js",
"@ember/renderer/index.js": "ember-source/@ember/renderer/index.js",
"@ember/routing/-internals.js": "ember-source/@ember/routing/-internals.js",
Expand Down Expand Up @@ -388,7 +374,8 @@
"ember/version.js": "ember-source/ember/version.js",
"route-recognizer/index.js": "ember-source/route-recognizer/index.js",
"router_js/index.js": "ember-source/router_js/index.js",
"rsvp/index.js": "ember-source/rsvp/index.js"
"rsvp/index.js": "ember-source/rsvp/index.js",
"tracked-built-ins/index.js": "ember-source/tracked-built-ins/index.js"
}
},
"typesVersions": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ export default class CurlyComponentManager
/*
* This hook is responsible for actually instantiating the component instance.
* It also is where we perform additional bookkeeping to support legacy
* features like exposed by view mixins like ChildViewSupport, ActionSupport,
* features like exposed by view mixins like ChildViewSupport,
* etc.
*/
create(
Expand Down
Loading
Loading