diff --git a/broccoli/amd-compat-entrypoints/ember.debug.js b/broccoli/amd-compat-entrypoints/ember.debug.js index 198b2300139..68e0107aaae 100644 --- a/broccoli/amd-compat-entrypoints/ember.debug.js +++ b/broccoli/amd-compat-entrypoints/ember.debug.js @@ -194,9 +194,6 @@ d('@ember/object/computed', emberObjectComputed); import * as emberObjectCore from '@ember/object/core'; d('@ember/object/core', emberObjectCore); -import * as emberObjectEvents from '@ember/object/events'; -d('@ember/object/events', emberObjectEvents); - import * as emberObjectIndex from '@ember/object/index'; d('@ember/object/index', emberObjectIndex); diff --git a/package.json b/package.json index 13d84447c8a..7d187e03c16 100644 --- a/package.json +++ b/package.json @@ -259,7 +259,6 @@ "@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/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", diff --git a/packages/@ember/object/events.ts b/packages/@ember/object/events.ts deleted file mode 100644 index 3f4559266fc..00000000000 --- a/packages/@ember/object/events.ts +++ /dev/null @@ -1 +0,0 @@ -export { addListener, removeListener, sendEvent } from '@ember/-internals/metal'; diff --git a/packages/@ember/object/mixin.ts b/packages/@ember/object/mixin.ts index 32b550c2cf9..1e130124003 100644 --- a/packages/@ember/object/mixin.ts +++ b/packages/@ember/object/mixin.ts @@ -27,7 +27,7 @@ import { defineDecorator, defineValue, } from '@ember/-internals/metal'; -import { addListener, removeListener } from '@ember/object/events'; +import { addListener, removeListener } from '@ember/-internals/metal'; const a_concat = Array.prototype.concat; const { isArray } = Array; diff --git a/packages/ember/barrel.ts b/packages/ember/barrel.ts index 9798a701b18..ba1009b8867 100644 --- a/packages/ember/barrel.ts +++ b/packages/ember/barrel.ts @@ -34,11 +34,6 @@ import { dependentKeyCompat } from '@ember/object/compat'; import EmberComputedProperty, { expandProperties as emberExpandProperties, } from '@ember/object/computed'; -import { - addListener as emberAddListener, - removeListener as emberRemoveListener, - sendEvent as emberSendEvent, -} from '@ember/object/events'; import { RSVP as _RSVP } from '@ember/-internals/runtime'; import { @@ -293,11 +288,6 @@ namespace Ember { export const CoreObject = EmberCoreObject; export type CoreObject = EmberCoreObject; - // ****@ember/object/events**** - export const addListener = emberAddListener; - export const removeListener = emberRemoveListener; - export const sendEvent = emberSendEvent; - // ****@ember/object/mixin**** export const Mixin = EmberMixin; export type Mixin = EmberMixin; diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js index a54b961a708..1027143e000 100644 --- a/packages/ember/tests/reexports_test.js +++ b/packages/ember/tests/reexports_test.js @@ -76,7 +76,6 @@ import * as test21 from '@ember/object'; import * as test22 from '@ember/object/compat'; import * as test23 from '@ember/object/computed'; import * as test24 from '@ember/object/core'; -import * as test26 from '@ember/object/events'; import * as test27 from '@ember/object/internals'; import * as test28 from '@ember/object/mixin'; import * as test30 from '@ember/object/observers'; @@ -194,9 +193,6 @@ let allExports = [ ['ComputedProperty', '@ember/object/computed', 'default', test23], ['expandProperties', '@ember/object/computed', 'expandProperties', test23], ['CoreObject', '@ember/object/core', 'default', test24], - ['addListener', '@ember/object/events', 'addListener', test26], - ['removeListener', '@ember/object/events', 'removeListener', test26], - ['sendEvent', '@ember/object/events', 'sendEvent', test26], ['cacheFor', '@ember/object/internals', 'cacheFor', test27], ['guidFor', '@ember/object/internals', 'guidFor', test27], ['Mixin', '@ember/object/mixin', 'default', test28], diff --git a/type-tests/ember/ember-module-tests.ts b/type-tests/ember/ember-module-tests.ts index 7c58fdf675c..20eaad63bd9 100644 --- a/type-tests/ember/ember-module-tests.ts +++ b/type-tests/ember/ember-module-tests.ts @@ -2,11 +2,6 @@ import type Owner from '@ember/owner'; import Ember from 'ember'; import { expectTypeOf } from 'expect-type'; -// addListener -Ember.addListener({ a: 'foo' }, 'event', {}, () => {}); -Ember.addListener({ a: 'foo' }, 'event', {}, 'a'); -Ember.addListener({ a: 'foo' }, 'event', {}, 'b'); -Ember.addListener({ a: 'foo' }, 'event', null, () => {}); // addObserver Ember.addObserver({ a: 'foo' }, 'a', null, () => {}); Ember.addObserver({ a: 'foo' }, 'a', {}, () => {}); @@ -67,21 +62,11 @@ class O2 extends Ember.Object { name = 'foo'; age = 3; } -const o2 = O2.create({ - name: 'foo', - age: 3, -}); -// removeListener -Ember.removeListener(O2, 'create', null, () => {}); -Ember.removeListener(O2, 'create', null, 'create'); -Ember.removeListener({}, 'create', null, 'blah'); // removeObserver Ember.removeObserver(O2, 'create', () => {}); Ember.removeObserver({}, 'create', () => {}); // runInDebug Ember.runInDebug(() => {}); -// sendEvent -expectTypeOf(Ember.sendEvent(o2, 'clicked', [1, 2])).toBeBoolean(); // set expectTypeOf(Ember.set(O2.create(), 'name', 'bar')).toEqualTypeOf(); expectTypeOf(Ember.set(O2.create(), 'age', 4)).toEqualTypeOf(); diff --git a/type-tests/ember/event.ts b/type-tests/ember/event.ts deleted file mode 100755 index fa6664da0dd..00000000000 --- a/type-tests/ember/event.ts +++ /dev/null @@ -1,15 +0,0 @@ -import Ember from 'ember'; - -function testListener() { - class TestListener extends Ember.Component { - init() { - Ember.addListener(this, 'willDestroyElement', this, 'willDestroyListener'); - Ember.addListener(this, 'willDestroyElement', this, 'willDestroyListener', true); - Ember.addListener(this, 'willDestroyElement', this, this.willDestroyListener); - Ember.addListener(this, 'willDestroyElement', this, this.willDestroyListener, true); - Ember.removeListener(this, 'willDestroyElement', this, 'willDestroyListener'); - Ember.removeListener(this, 'willDestroyElement', this, this.willDestroyListener); - } - willDestroyListener() {} - } -}