From 0b7f84feab5888e8892f374af2ffb1cdaea68923 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Tue, 9 Jun 2020 20:02:08 -0500
Subject: [PATCH] remove re-export

---
 src/plugins/data/common/index_patterns/index.ts       |  1 +
 src/plugins/data/public/index_patterns/index.ts       | 11 +++++------
 .../public/index_patterns/index_patterns/index.ts     |  1 -
 src/plugins/data/public/search/search_service.ts      |  2 +-
 .../search/search_source/create_search_source.test.ts |  2 +-
 .../search/search_source/create_search_source.ts      |  2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/plugins/data/common/index_patterns/index.ts b/src/plugins/data/common/index_patterns/index.ts
index d26587efccc0f..4f46f4737ab0f 100644
--- a/src/plugins/data/common/index_patterns/index.ts
+++ b/src/plugins/data/common/index_patterns/index.ts
@@ -19,3 +19,4 @@
 
 export * from './fields';
 export * from './types';
+export * from './index_patterns';
diff --git a/src/plugins/data/public/index_patterns/index.ts b/src/plugins/data/public/index_patterns/index.ts
index 0a8397467807c..d1b9d36645768 100644
--- a/src/plugins/data/public/index_patterns/index.ts
+++ b/src/plugins/data/public/index_patterns/index.ts
@@ -26,19 +26,18 @@ export {
   getFromSavedObject,
   isDefault,
 } from '../../common/index_patterns/lib';
-export { flattenHitWrapper, formatHitProvider, onRedirectNoIndexPattern } from './index_patterns';
+export { onRedirectNoIndexPattern } from './index_patterns';
 
+export { flattenHitWrapper, formatHitProvider } from '../../common/index_patterns/index_patterns';
+
+// TODO: figure out how to replace IndexPatterns in get_inner_angular.
 export {
   getIndexPatternFieldListCreator,
   Field,
   IIndexPatternFieldList,
-} from '../../common/index_patterns';
-
-// TODO: figure out how to replace IndexPatterns in get_inner_angular.
-export {
   IndexPatternsService,
   IndexPatternsContract,
   IndexPattern,
   TypeMeta,
   AggregationRestrictions,
-} from './index_patterns';
+} from '../../common/index_patterns';
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index.ts b/src/plugins/data/public/index_patterns/index_patterns/index.ts
index 0db1c8c68b4ac..293efed07fddc 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index.ts
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-export * from '../../../common/index_patterns/index_patterns';
 export * from './redirect_no_index_pattern';
diff --git a/src/plugins/data/public/search/search_service.ts b/src/plugins/data/public/search/search_service.ts
index d5997c15817f6..876e09f323d51 100644
--- a/src/plugins/data/public/search/search_service.ts
+++ b/src/plugins/data/public/search/search_service.ts
@@ -27,7 +27,7 @@ import { TStrategyTypes } from './strategy_types';
 import { getEsClient, LegacyApiCaller } from './legacy';
 import { ES_SEARCH_STRATEGY, DEFAULT_SEARCH_STRATEGY } from '../../common/search';
 import { esSearchStrategyProvider } from './es_search';
-import { IndexPatternsContract } from '../index_patterns/index_patterns';
+import { IndexPatternsContract } from '../index_patterns';
 import { QuerySetup } from '../query';
 import { GetInternalStartServicesFn } from '../types';
 import { SearchInterceptor } from './search_interceptor';
diff --git a/src/plugins/data/public/search/search_source/create_search_source.test.ts b/src/plugins/data/public/search/search_source/create_search_source.test.ts
index 23ab5979595af..074210711e8af 100644
--- a/src/plugins/data/public/search/search_source/create_search_source.test.ts
+++ b/src/plugins/data/public/search/search_source/create_search_source.test.ts
@@ -18,7 +18,7 @@
  */
 import { createSearchSource as createSearchSourceFactory } from './create_search_source';
 import { IIndexPattern } from '../../../common/index_patterns';
-import { IndexPatternsContract } from '../../index_patterns/index_patterns';
+import { IndexPatternsContract } from '../../index_patterns';
 import { Filter } from '../../../common/es_query/filters';
 import { coreMock } from '../../../../../core/public/mocks';
 import { dataPluginMock } from '../../mocks';
diff --git a/src/plugins/data/public/search/search_source/create_search_source.ts b/src/plugins/data/public/search/search_source/create_search_source.ts
index 3466d60e5dd7e..93e9e7ea96c8e 100644
--- a/src/plugins/data/public/search/search_source/create_search_source.ts
+++ b/src/plugins/data/public/search/search_source/create_search_source.ts
@@ -18,7 +18,7 @@
  */
 import { migrateLegacyQuery } from '../../../../kibana_legacy/public';
 import { SearchSource, SearchSourceDependencies } from './search_source';
-import { IndexPatternsContract } from '../../index_patterns/index_patterns';
+import { IndexPatternsContract } from '../../index_patterns';
 import { SearchSourceFields } from './types';
 
 /**