Remove redundant x-pack/typings. (elastic#55042)

jkelastic · Jan 17, 2020 · b6019dc · b6019dc
1 parent 10fdbd1
commit b6019dc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 72 deletions.
diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json
@@ -7,7 +7,10 @@
     ]
   },
   "include": [
-    "**/*"
+    "**/*",
+    "../typings/**/*"
   ],
-  "exclude": []
+  "exclude": [
+    "../typings/jest.d.ts"
+  ]
 }
diff --git a/x-pack/test/typings/hapi.d.ts b/x-pack/test/typings/hapi.d.ts
diff --git a/x-pack/test/typings/hapi_basic.d.ts b/x-pack/test/typings/hapi_basic.d.ts
diff --git a/x-pack/test/typings/index.d.ts b/x-pack/test/typings/index.d.ts
diff --git a/x-pack/typings/index.d.ts b/x-pack/typings/index.d.ts
@@ -27,15 +27,6 @@ type Writable<T> = {
   -readonly [K in keyof T]: T[K];
 };
 
-type MockedKeys<T> = { [P in keyof T]: jest.Mocked<Writable<T[P]>> };
-
-type DeeplyMockedKeys<T> = {
-  [P in keyof T]: T[P] extends (...args: any[]) => any
-    ? jest.MockInstance<ReturnType<T[P]>, Parameters<T[P]>>
-    : DeeplyMockedKeys<T[P]>;
-} &
-  T;
-
 // allow JSON files to be imported directly without lint errors
 // see: https://github.com/palantir/tslint/issues/1264#issuecomment-228433367
 // and: https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#arbitrary-expressions-are-forbidden-in-export-assignments-in-ambient-contexts

diff --git a/x-pack/typings/jest_styled_components.d.ts → x-pack/typings/jest.d.ts b/x-pack/typings/jest_styled_components.d.ts → x-pack/typings/jest.d.ts
@@ -4,8 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// https://github.com/styled-components/jest-styled-components/issues/264
+type MockedKeys<T> = { [P in keyof T]: jest.Mocked<Writable<T[P]>> };
+
+type DeeplyMockedKeys<T> = {
+  [P in keyof T]: T[P] extends (...args: any[]) => any
+    ? jest.MockInstance<ReturnType<T[P]>, Parameters<T[P]>>
+    : DeeplyMockedKeys<T[P]>;
+} &
+  T;
 
+// https://github.com/styled-components/jest-styled-components/issues/264
 declare namespace jest {
   interface AsymmetricMatcher {
     $$typeof: Symbol; //eslint-disable-line