Skip to content

Commit 6d514d5

Browse files
authored
Merge pull request #20919 from wagenet/kill-more-mixins
[Next] Kill Action Mixins
2 parents f74a525 + a6760ec commit 6d514d5

File tree

22 files changed

+23
-1041
lines changed

22 files changed

+23
-1041
lines changed

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ d('@ember/-internals/runtime/index', emberinternalsRuntimeIndex);
5656
import * as emberinternalsRuntimeLibExtRsvp from '@ember/-internals/runtime/lib/ext/rsvp';
5757
d('@ember/-internals/runtime/lib/ext/rsvp', emberinternalsRuntimeLibExtRsvp);
5858

59-
import * as emberinternalsRuntimeLibMixinsActionHandler from '@ember/-internals/runtime/lib/mixins/action_handler';
60-
d(
61-
'@ember/-internals/runtime/lib/mixins/action_handler',
62-
emberinternalsRuntimeLibMixinsActionHandler
63-
);
64-
6559
import * as emberinternalsRuntimeLibMixinsContainerProxy from '@ember/-internals/runtime/lib/mixins/container_proxy';
6660
d(
6761
'@ember/-internals/runtime/lib/mixins/container_proxy',
@@ -74,12 +68,6 @@ d(
7468
emberinternalsRuntimeLibMixinsRegistryProxy
7569
);
7670

77-
import * as emberinternalsRuntimeLibMixinsTargetActionSupport from '@ember/-internals/runtime/lib/mixins/target_action_support';
78-
d(
79-
'@ember/-internals/runtime/lib/mixins/target_action_support',
80-
emberinternalsRuntimeLibMixinsTargetActionSupport
81-
);
82-
8371
import * as emberinternalsStringIndex from '@ember/-internals/string/index';
8472
d('@ember/-internals/string/index', emberinternalsStringIndex);
8573

@@ -104,9 +92,6 @@ d(
10492
import * as emberinternalsViewsLibComponentLookup from '@ember/-internals/views/lib/component_lookup';
10593
d('@ember/-internals/views/lib/component_lookup', emberinternalsViewsLibComponentLookup);
10694

107-
import * as emberinternalsViewsLibMixinsActionSupport from '@ember/-internals/views/lib/mixins/action_support';
108-
d('@ember/-internals/views/lib/mixins/action_support', emberinternalsViewsLibMixinsActionSupport);
109-
11095
import * as emberinternalsViewsLibSystemActionManager from '@ember/-internals/views/lib/system/action_manager';
11196
d('@ember/-internals/views/lib/system/action_manager', emberinternalsViewsLibSystemActionManager);
11297

package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,18 +203,15 @@
203203
"@ember/-internals/routing/index.js": "ember-source/@ember/-internals/routing/index.js",
204204
"@ember/-internals/runtime/index.js": "ember-source/@ember/-internals/runtime/index.js",
205205
"@ember/-internals/runtime/lib/ext/rsvp.js": "ember-source/@ember/-internals/runtime/lib/ext/rsvp.js",
206-
"@ember/-internals/runtime/lib/mixins/action_handler.js": "ember-source/@ember/-internals/runtime/lib/mixins/action_handler.js",
207206
"@ember/-internals/runtime/lib/mixins/container_proxy.js": "ember-source/@ember/-internals/runtime/lib/mixins/container_proxy.js",
208207
"@ember/-internals/runtime/lib/mixins/registry_proxy.js": "ember-source/@ember/-internals/runtime/lib/mixins/registry_proxy.js",
209-
"@ember/-internals/runtime/lib/mixins/target_action_support.js": "ember-source/@ember/-internals/runtime/lib/mixins/target_action_support.js",
210208
"@ember/-internals/string/index.js": "ember-source/@ember/-internals/string/index.js",
211209
"@ember/-internals/utility-types/index.js": "ember-source/@ember/-internals/utility-types/index.js",
212210
"@ember/-internals/utils/index.js": "ember-source/@ember/-internals/utils/index.js",
213211
"@ember/-internals/views/index.js": "ember-source/@ember/-internals/views/index.js",
214212
"@ember/-internals/views/lib/compat/attrs.js": "ember-source/@ember/-internals/views/lib/compat/attrs.js",
215213
"@ember/-internals/views/lib/compat/fallback-view-registry.js": "ember-source/@ember/-internals/views/lib/compat/fallback-view-registry.js",
216214
"@ember/-internals/views/lib/component_lookup.js": "ember-source/@ember/-internals/views/lib/component_lookup.js",
217-
"@ember/-internals/views/lib/mixins/action_support.js": "ember-source/@ember/-internals/views/lib/mixins/action_support.js",
218215
"@ember/-internals/views/lib/system/action_manager.js": "ember-source/@ember/-internals/views/lib/system/action_manager.js",
219216
"@ember/-internals/views/lib/system/event_dispatcher.js": "ember-source/@ember/-internals/views/lib/system/event_dispatcher.js",
220217
"@ember/-internals/views/lib/system/utils.js": "ember-source/@ember/-internals/views/lib/system/utils.js",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ export default class CurlyComponentManager
239239
/*
240240
* This hook is responsible for actually instantiating the component instance.
241241
* It also is where we perform additional bookkeeping to support legacy
242-
* features like exposed by view mixins like ChildViewSupport, ActionSupport,
242+
* features like exposed by view mixins like ChildViewSupport,
243243
* etc.
244244
*/
245245
create(

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ import {
77
} from '@ember/-internals/metal';
88
import type { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
99
import { getOwner } from '@ember/-internals/owner';
10-
import { TargetActionSupport } from '@ember/-internals/runtime';
1110
import type { ViewStates } from '@ember/-internals/views';
1211
import {
13-
ActionSupport,
1412
addChildView,
1513
CoreView,
1614
EventDispatcher,
@@ -789,22 +787,14 @@ declare const SIGNATURE: unique symbol;
789787
790788
@class Component
791789
@extends Ember.CoreView
792-
@uses Ember.TargetActionSupport
793-
@uses Ember.ActionSupport
794790
@public
795791
*/
796792
// This type param is used in the class, so must appear here.
797793
// eslint-disable-next-line @typescript-eslint/no-unused-vars
798-
interface Component<S = unknown>
799-
extends CoreView,
800-
TargetActionSupport,
801-
ActionSupport,
802-
ComponentMethods {}
794+
interface Component<S = unknown> extends CoreView, ComponentMethods {}
803795

804796
class Component<S = unknown>
805797
extends CoreView.extend(
806-
TargetActionSupport,
807-
ActionSupport,
808798
{
809799
// These need to be overridable via extend/create but should still
810800
// have a default. Defining them here is the best way to achieve that.

packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js

Lines changed: 0 additions & 194 deletions
This file was deleted.
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
22
export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
3-
export { default as ActionHandler } from './lib/mixins/action_handler';
43
export { default as MutableEnumerable } from '@ember/enumerable/mutable';
5-
export { default as TargetActionSupport } from './lib/mixins/target_action_support';
64

75
export { default as RSVP, onerrorDefault } from './lib/ext/rsvp'; // just for side effect of extending Ember.RSVP

0 commit comments

Comments
 (0)