From 465aea12e4ecf7692d8d4e6e4f77bc7a032945f6 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Mon, 11 Feb 2019 20:40:23 +0100
Subject: [PATCH 1/3] [ember] Fix wrongly deprecated Ember.assign

---
 types/ember/index.d.ts            | 1 -
 types/ember/v2/index.d.ts         | 3 +--
 types/ember__polyfills/index.d.ts | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index d0f9896eb9..d7aaa35b36 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -498,7 +498,6 @@ export namespace Ember {
     // TODO: replace with an es6 reexport when declare module 'ember' is removed
     /**
      * Copy properties from a source object to a target object.
-     * @deprecated Use Object.assign
      */
     const assign: typeof EmberPolyfillsNs.assign;
     /**
diff --git a/types/ember/v2/index.d.ts b/types/ember/v2/index.d.ts
index 54b6d2e4a9..1734ee6a14 100755
--- a/types/ember/v2/index.d.ts
+++ b/types/ember/v2/index.d.ts
@@ -3131,7 +3131,7 @@ declare module 'ember' {
         function isPresent(obj: any): boolean;
         /**
          * Merge the contents of two objects together into the first object.
-         * @deprecated Use Object.assign
+         * @deprecated Use Ember.assign
          */
         function merge<T, U>(original: T, updates: U): T & U;
         /**
@@ -3284,7 +3284,6 @@ declare module 'ember' {
         function typeOf(item: any): string;
         /**
          * Copy properties from a source object to a target object.
-         * @deprecated Use Object.assign
          */
         function assign<T, U>(target: T, source: U): T & U;
         function assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
diff --git a/types/ember__polyfills/index.d.ts b/types/ember__polyfills/index.d.ts
index e5ace0fe2e..01820351e5 100644
--- a/types/ember__polyfills/index.d.ts
+++ b/types/ember__polyfills/index.d.ts
@@ -8,7 +8,6 @@ import { Mix, Mix3, Mix4 } from './types';
 
 /**
  * Copy properties from a source object to a target object.
- * @deprecated Use Object.assign
  */
 export function assign<T extends object, U extends object>(target: T, source: U): Mix<T, U>;
 export function assign<T extends object, U extends object, V extends object>(target: T, source1: U, source2: V): Mix3<T, U, V>;
@@ -17,6 +16,6 @@ export function assign(target: object, ...sources: object[]): any;
 
 /**
  * Merge the contents of two objects together into the first object.
- * @deprecated Use Object.assign
+ * @deprecated Use Ember.assign
  */
 export function merge<T extends object, U extends object>(original: T, updates: U): Mix<T, U>;

From 4245ec91060834381448443e347f7bb751e74855 Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Fri, 1 Mar 2019 11:57:56 -0800
Subject: [PATCH 2/3] [ember/v2] remove dependency on handlebars types

---
 types/ember/v2/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/ember/v2/index.d.ts b/types/ember/v2/index.d.ts
index 1734ee6a14..cfc95ed691 100755
--- a/types/ember/v2/index.d.ts
+++ b/types/ember/v2/index.d.ts
@@ -12,7 +12,6 @@
 // TypeScript Version: 2.4
 
 /// <reference types="jquery" />
-/// <reference types="handlebars" />
 
 declare module 'ember' {
     // Capitalization is intentional: this makes it much easier to re-export RSVP on

From 9ecdc820da5e79c24a6d9abcf6336ff459e05a0b Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Fri, 1 Mar 2019 12:00:16 -0800
Subject: [PATCH 3/3] [ember/v2] add limited handlebars types to old ember
 types

---
 types/ember/v2/index.d.ts          | 1 +
 types/ember/v2/test/ember-tests.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/ember/v2/index.d.ts b/types/ember/v2/index.d.ts
index cfc95ed691..b414a6f79b 100755
--- a/types/ember/v2/index.d.ts
+++ b/types/ember/v2/index.d.ts
@@ -2414,6 +2414,7 @@ declare module 'ember' {
             function print(ast: any): void;
             const logger: typeof Ember.Logger;
             function log(level: string, str: string): void;
+            function registerHelper(name: string, helper: any): void;
         }
         namespace String {
             function camelize(str: string): string;
diff --git a/types/ember/v2/test/ember-tests.ts b/types/ember/v2/test/ember-tests.ts
index c049512eb0..892c9ed9a8 100755
--- a/types/ember/v2/test/ember-tests.ts
+++ b/types/ember/v2/test/ember-tests.ts
@@ -92,10 +92,10 @@ App.userController = Ember.Object.create({
     }),
 });
 
-Handlebars.registerHelper(
+Ember.Handlebars.registerHelper(
     'highlight',
     (property: string, options: any) =>
-        new Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
+        new Ember.Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
 );
 
 const coolView = App.CoolView.create();