From f48033fba6be70841d67a676cb9c3149e64a218e Mon Sep 17 00:00:00 2001
From: Alex LaFroscia <alex@lafroscia.com>
Date: Tue, 3 Apr 2018 10:27:19 -0700
Subject: [PATCH 1/2] Add `EmberArray` type export to '@ember/array'

---
 types/ember/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 6d8adebae2..c7d344e658 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -3408,6 +3408,7 @@ declare module '@ember/application/resolver' {
 
 declare module '@ember/array' {
     import Ember from 'ember';
+    type EmberArray<T> = Ember.Array<T>;
     const EmberArray: typeof Ember.Array;
     export default EmberArray;
     export const A: typeof Ember.A;

From a85c598a91355f3331a4571de824f368d9708e52 Mon Sep 17 00:00:00 2001
From: Alex LaFroscia <alex@lafroscia.com>
Date: Tue, 3 Apr 2018 12:54:07 -0700
Subject: [PATCH 2/2] Add type exports for additional types

---
 types/ember/index.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index c7d344e658..740ff1308c 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -6,6 +6,7 @@
 //                 Chris Krycho <https://github.com/chriskrycho>
 //                 Theron Cross <https://github.com/theroncross>
 //                 Martin Feckie <https://github.com/mfeckie>
+//                 Alex LaFroscia <https://github.com/alexlafroscia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -3418,6 +3419,7 @@ declare module '@ember/array' {
 
 declare module '@ember/array/mutable' {
     import Ember from 'ember';
+    type MutableArray<T> = Ember.MutableArray<T>;
     const MutableArray: typeof Ember.MutableArray;
     export default MutableArray;
 }
@@ -3497,6 +3499,7 @@ declare module '@ember/engine/instance' {
 
 declare module '@ember/enumerable' {
     import Ember from 'ember';
+    type Enumerable<T> = Ember.Enumerable<T>;
     const Enumerable: typeof Ember.Enumerable;
     export default Enumerable;
 }
@@ -3585,6 +3588,7 @@ declare module '@ember/object/core' {
 
 declare module '@ember/object/evented' {
     import Ember from 'ember';
+    type Evented = Ember.Evented;
     const Evented: typeof Ember.Evented;
     export default Evented;
     export const on: typeof Ember.on;
@@ -3611,6 +3615,7 @@ declare module '@ember/object/mixin' {
 
 declare module '@ember/object/observable' {
     import Ember from 'ember';
+    type Observable = Ember.Observable;
     const Observable: typeof Ember.Observable;
     export default Observable;
 }
@@ -3623,6 +3628,7 @@ declare module '@ember/object/observers' {
 
 declare module '@ember/object/promise-proxy-mixin' {
     import Ember from 'ember';
+    type PromiseProxyMixin<T> = Ember.PromiseProxyMixin<T>;
     const PromiseProxyMixin: typeof Ember.PromiseProxyMixin;
     export default PromiseProxyMixin;
 }