From 0acbec3d02c55bd6118b625f0d91a5aa4016b9c2 Mon Sep 17 00:00:00 2001
From: Alexander T <alexander.tarasyuk@outlook.com>
Date: Tue, 12 Nov 2019 22:42:32 +0200
Subject: [PATCH] jest-diff: Provides its own types (#39589)

---
 notNeededPackages.json             |  6 +++++
 types/jest-diff/index.d.ts         | 18 -------------
 types/jest-diff/jest-diff-tests.ts | 42 ------------------------------
 types/jest-diff/tsconfig.json      | 23 ----------------
 types/jest-diff/tslint.json        |  3 ---
 types/jest/package.json            |  6 +++++
 6 files changed, 12 insertions(+), 86 deletions(-)
 delete mode 100644 types/jest-diff/index.d.ts
 delete mode 100644 types/jest-diff/jest-diff-tests.ts
 delete mode 100644 types/jest-diff/tsconfig.json
 delete mode 100644 types/jest-diff/tslint.json
 create mode 100644 types/jest/package.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 42f5ab6f4e..9a9818d943 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -2148,6 +2148,12 @@
             "sourceRepoURL": "https://github.com/dmester/jdenticon",
             "asOfVersion": "2.2.0"
         },
+        {
+            "libraryName": "jest-diff",
+            "typingsPackageName": "jest-diff",
+            "sourceRepoURL": "https://github.com/facebook/jest/tree/master/packages/jest-diff",
+            "asOfVersion": "24.3.0"
+        },
         {
             "libraryName": "jest-get-type",
             "typingsPackageName": "jest-get-type",
diff --git a/types/jest-diff/index.d.ts b/types/jest-diff/index.d.ts
deleted file mode 100644
index 022626ab2c..0000000000
--- a/types/jest-diff/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for jest-diff 20.0
-// Project: https://github.com/facebook/jest/tree/master/packages/jest-diff, https://github.com/facebook/jest
-// Definitions by: Alex Coles <https://github.com/myabc>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-declare namespace diff {
-    interface DiffOptions {
-        aAnnotation?: string;
-        bAnnotation?: string;
-        expand?: boolean;
-        contextLines?: number;
-    }
-}
-
-declare function diff(a: any, b: any, options?: diff.DiffOptions): string;
-
-export = diff;
diff --git a/types/jest-diff/jest-diff-tests.ts b/types/jest-diff/jest-diff-tests.ts
deleted file mode 100644
index 01e0453e61..0000000000
--- a/types/jest-diff/jest-diff-tests.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import diff = require('jest-diff');
-
-diff([], ['a']); // $ExpectType string
-diff(false, true);
-diff(null, null);
-diff(1000, 1001);
-diff(/d+/, /w+/);
-diff(new Map(), new Map());
-diff(new Set(), new Set());
-diff(new Date(), new Date());
-diff('ts', 'js');
-diff(Symbol(), Symbol(1));
-diff(undefined, undefined);
-
-diff([], ['a'], { }); // $ExpectType string
-diff([], ['a'], { expand: false }); // $ExpectType string
-diff([], ['a'], { contextLines: 3 }); // $ExpectType string
-// $ExpectType string
-diff([], ['a'], {
-    aAnnotation: 'esperado',
-    bAnnotation: 'recibido'
-});
-
-diff(); // $ExpectError
-diff([]); // $ExpectError
-// diff([], {}, []); // $ExpectError (does not error on 2.3)
-
-diff([], ['a'], { expand: false }); // $ExpectType string
-diff([], ['a'], { contextLines: 3 }); // $ExpectType string
-// $ExpectType string
-diff([], ['a'], {
-    aAnnotation: 'esperado',
-    bAnnotation: 'recibido'
-});
-
-// $ExpectError
-diff([], ['a'], {
-    expand: 'yeah',
-    aAnnotation: false,
-    bAnnotation: {},
-    contextLines: 'two'
-});
diff --git a/types/jest-diff/tsconfig.json b/types/jest-diff/tsconfig.json
deleted file mode 100644
index 47bd8d3f9b..0000000000
--- a/types/jest-diff/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",
-        "jest-diff-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/jest-diff/tslint.json b/types/jest-diff/tslint.json
deleted file mode 100644
index f93cf8562a..0000000000
--- a/types/jest-diff/tslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "extends": "dtslint/dt.json"
-}
diff --git a/types/jest/package.json b/types/jest/package.json
new file mode 100644
index 0000000000..f8fa82ba32
--- /dev/null
+++ b/types/jest/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "jest-diff": "^24.3.0"
+    }
+}