diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts index 91cdc80868..6119f625d4 100755 --- a/types/ember/index.d.ts +++ b/types/ember/index.d.ts @@ -3333,12 +3333,6 @@ declare module 'ember' { : undefined; function tryInvoke(obj: T, methodName: FNAME): T[FNAME] extends (() => any) ? ReturnType : undefined; function tryInvoke(obj: object, methodName: string, args?: any[]): undefined; - /** - * Forces the passed object to be part of an array. If the object is already - * an array, it will return the object. Otherwise, it will add the object to - * an array. If obj is `null` or `undefined`, it will return an empty array. - */ - function makeArray(obj?: T[] | T | null): T[]; /** * Framework objects in an Ember application (components, services, routes, etc.) * are created via a factory and dependency injection system. Each of these @@ -3553,7 +3547,6 @@ declare module '@ember/array' { export default EmberArray; export const A: typeof Ember.A; export const isArray: typeof Ember.isArray; - export const makeArray: typeof Ember.makeArray; } declare module '@ember/array/mutable' { @@ -3649,37 +3642,12 @@ declare module '@ember/engine/instance' { export default class EngineInstance extends Ember.EngineInstance { } } -declare module '@ember/enumerable' { - import Ember from 'ember'; - type Enumerable = Ember.Enumerable; - const Enumerable: typeof Ember.Enumerable; - export default Enumerable; -} - declare module '@ember/error' { import Ember from 'ember'; const Error: typeof Ember.Error; export default Error; } -declare module '@ember/instrumentation' { - import Ember from 'ember'; - export const instrument: typeof Ember.instrument; - export const reset: typeof Ember.reset; - export const subscribe: typeof Ember.subscribe; - export const unsubscribe: typeof Ember.unsubscribe; -} - -declare module '@ember/map' { - import Ember from 'ember'; - export default class EmberMap extends Ember.Map { } -} - -declare module '@ember/map/with-default' { - import Ember from 'ember'; - export default class MapWithDefault extends Ember.MapWithDefault { } -} - declare module '@ember/object' { import Ember from 'ember'; export default class EmberObject extends Ember.Object { } diff --git a/types/ember/test/utils.ts b/types/ember/test/utils.ts index 77b52ca218..f9b1f198d2 100755 --- a/types/ember/test/utils.ts +++ b/types/ember/test/utils.ts @@ -62,14 +62,6 @@ function testOnError() { }; } -function testMakeArray() { - assertType(Ember.makeArray()); - assertType(Ember.makeArray(null)); - assertType(Ember.makeArray(undefined)); - assertType(Ember.makeArray('lindsay')); - assertType(Ember.makeArray([1, 2, 42])); -} - function testDeprecateFunc() { function newMethod(first: string, second: number): string { return '';