vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2025-10-16 12:05:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #33520 from mike-north/ember-assign

Browse Source 
[ember] Remove improperly-deprecated Ember.assign
This commit is contained in:
Nathan Shively-Sanders 2019-03-07 16:23:49 -08:00 committed by GitHub
commit ee101ed5b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
types/ember/index.d.ts vendored
View File

@ -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;
/**

3
types/ember/v2/index.d.ts vendored
View File

@ -3137,7 +3137,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;
/**
@ -3290,7 +3290,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;

3
types/ember__polyfills/index.d.ts vendored
View File

@ -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>;