diff --git a/notNeededPackages.json b/notNeededPackages.json index 968192123b..010aa98828 100644 --- a/notNeededPackages.json +++ b/notNeededPackages.json @@ -396,6 +396,12 @@ "sourceRepoURL": "https://github.com/MikeMcl/decimal.js", "asOfVersion": "7.4.0" }, + { + "libraryName": "deepmerge", + "typingsPackageName": "deepmerge", + "sourceRepoURL": "git@github.com:KyleAMathews/deepmerge.git", + "asOfVersion": "2.2.0" + }, { "libraryName": "delay", "typingsPackageName": "delay", diff --git a/types/deepmerge/deepmerge-tests.ts b/types/deepmerge/deepmerge-tests.ts deleted file mode 100644 index dcd21ff3c3..0000000000 --- a/types/deepmerge/deepmerge-tests.ts +++ /dev/null @@ -1,29 +0,0 @@ -import * as deepmerge from "deepmerge"; - -const x = { - foo: { bar: 3 }, - array: [{ does: 'work', too: [1, 2, 3] }] -}; -const y = { - foo: { baz: 4 }, - quux: 5, - array: [{ does: 'work', too: [4, 5, 6] }, { really: 'yes' }] -}; - -const expected = { - foo: { bar: 3, baz: 4 }, - array: [{ does: 'work', too: [1, 2, 3, 4, 5, 6] }, { really: 'yes' }], - quux: 5 -}; - -const result = deepmerge(x, y); -const anyResult = deepmerge(x, y); - -function reverseConcat(dest: number[], src: number[]) { - return src.concat(dest); -} - -const withOptions = deepmerge(x, y, { - clone: false, - arrayMerge: reverseConcat -}); diff --git a/types/deepmerge/index.d.ts b/types/deepmerge/index.d.ts deleted file mode 100644 index 39158354de..0000000000 --- a/types/deepmerge/index.d.ts +++ /dev/null @@ -1,29 +0,0 @@ -// Type definitions for deepmerge 2.1 -// Project: https://github.com/KyleAMathews/deepmerge -// Definitions by: marvinscharle -// syy1125 -// AppLover69 -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 - -export = deepmerge; - -declare function deepmerge(x: Partial, y: Partial, options?: deepmerge.Options): T; -declare function deepmerge(x: T1, y: T2, options?: deepmerge.Options): T1 & T2; - -declare namespace deepmerge { - interface Options { - clone?: boolean; - arrayMerge?(destination: any[], source: any[], options?: Options): any[]; - isMergeableObject?(value: object): boolean; - } - - function all(objects: Array>, options?: Options): T; -} - -declare global { - interface Window { - deepmerge(x: Partial, y: Partial, options?: deepmerge.Options): T; - deepmerge(x: T1, y: T2, options?: deepmerge.Options): T1 & T2; - } -} diff --git a/types/deepmerge/tsconfig.json b/types/deepmerge/tsconfig.json deleted file mode 100644 index b863d1bcb9..0000000000 --- a/types/deepmerge/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "lib": [ - "es6" - ], - "noImplicitAny": true, - "noImplicitThis": true, - "strictNullChecks": true, - "strictFunctionTypes": true, - "baseUrl": "../", - "typeRoots": [ - "../" - ], - "types": [], - "noEmit": true, - "forceConsistentCasingInFileNames": true - }, - "files": [ - "index.d.ts", - "deepmerge-tests.ts" - ] -} \ No newline at end of file diff --git a/types/deepmerge/tslint.json b/types/deepmerge/tslint.json deleted file mode 100644 index 3db14f85ea..0000000000 --- a/types/deepmerge/tslint.json +++ /dev/null @@ -1 +0,0 @@ -{ "extends": "dtslint/dt.json" }