vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-10-03 22:37:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ember] resolve merge conflicts

Browse Source
This commit is contained in:
Mike North
2018-09-21 16:49:43 -07:00
parent b06c90628d 5679ed161c
commit 6b4a611fb9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
types/ember-data/tsconfig.json
+2
View File
@@ -16,6 +16,8 @@
"paths": {
"@ember/debug": ["ember__debug"],
"@ember/debug/*": ["ember__debug/*"],
"@ember/array": ["ember__array"],
"@ember/array/*": ["ember__array/*"],
"@ember/object": ["ember__object"],
"@ember/object/*": ["ember__object/*"]
},
types/ember/index.d.ts
Vendored
+6 -6
View File
@@ -279,6 +279,12 @@ declare module 'ember' {
class ArrayProxy<T> extends EmberArrayProxy<T> {}
export type Array<T> = EmberArray<T>;
export const Array: typeof EmberArrayNs.default;
export type MutableArray<T> = EmberMutableArray<T>;
export const MutableArray: typeof EmberMutableArray;
export type NativeArray<T> = EmberNativeArray<T>;
export const NativeArray: typeof EmberNativeArray;
export type MutableEnumerable<T> = EmberMutableEnumerable<T>;
export const MutableEnumerable: typeof EmberMutableEnumerable;
interface FunctionPrototypeExtensions {
/**
* The `property` extension of Javascript's Function prototype is available
@@ -779,12 +785,6 @@ declare module 'ember' {
static create(): MapWithDefault;
}
class Mixin<T, Base = EmberObjectNs.default> extends EmberMixin<T, Base> {}
export type MutableArray<T> = EmberMutableArray<T>;
export const MutableArray: typeof EmberMutableArray;
export type NativeArray<T> = EmberNativeArray<T>;
export const NativeArray: typeof EmberNativeArray;
export type MutableEnumerable<T> = EmberMutableEnumerable<T>;
export const MutableEnumerable: typeof EmberMutableEnumerable;
/**
* A Namespace is an object usually used to contain other objects or methods