do not export all the types from licensing plugin (elastic#110942) (e…

…lastic#110963) * do not export all the types from licensing plugin * another export issue Co-authored-by: Mikhail Shustov <[email protected]>
gchaps · Sep 2, 2021 · 54cea57 · 54cea57
1 parent 90de809
commit 54cea57
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 23 deletions.
diff --git a/x-pack/plugins/licensing/public/index.ts b/x-pack/plugins/licensing/public/index.ts
@@ -5,12 +5,20 @@
  * 2.0.
  */
 
-// TODO: https://github.com/elastic/kibana/issues/110902
-/* eslint-disable @kbn/eslint/no_export_all */
+import type { PluginInitializerContext } from 'src/core/public';
 
-import { PluginInitializerContext } from 'src/core/public';
 import { LicensingPlugin } from './plugin';
 
-export * from '../common/types';
-export { LicensingPluginSetup, LicensingPluginStart } from './types';
+export type {
+  LicenseCheckState,
+  LicenseType,
+  LicenseStatus,
+  LicenseFeature,
+  PublicLicense,
+  PublicFeatures,
+  PublicLicenseJSON,
+  LicenseCheck,
+  ILicense,
+} from '../common/types';
+export type { LicensingPluginSetup, LicensingPluginStart } from './types';
 export const plugin = (context: PluginInitializerContext) => new LicensingPlugin(context);
diff --git a/x-pack/plugins/licensing/public/services/index.ts b/x-pack/plugins/licensing/public/services/index.ts
@@ -5,8 +5,5 @@
  * 2.0.
  */
 
-export {
-  FeatureUsageService,
-  FeatureUsageServiceSetup,
-  FeatureUsageServiceStart,
-} from './feature_usage_service';
+export { FeatureUsageService } from './feature_usage_service';
+export type { FeatureUsageServiceSetup, FeatureUsageServiceStart } from './feature_usage_service';
diff --git a/x-pack/plugins/licensing/server/index.ts b/x-pack/plugins/licensing/server/index.ts
@@ -5,16 +5,35 @@
  * 2.0.
  */
 
-// TODO: https://github.com/elastic/kibana/issues/110902
-/* eslint-disable @kbn/eslint/no_export_all */
-
 import { PluginInitializerContext } from 'src/core/server';
 import { LicensingPlugin } from './plugin';
 
 export const plugin = (context: PluginInitializerContext) => new LicensingPlugin(context);
 
-export * from '../common/types';
-export { FeatureUsageServiceSetup, FeatureUsageServiceStart } from './services';
-export * from './types';
+export type {
+  LicenseCheckState,
+  LicenseType,
+  LicenseStatus,
+  LicenseFeature,
+  PublicLicense,
+  PublicFeatures,
+  PublicLicenseJSON,
+  LicenseCheck,
+  ILicense,
+} from '../common/types';
+
+export { LICENSE_TYPE } from '../common/types';
+
+export type { FeatureUsageServiceSetup, FeatureUsageServiceStart } from './services';
+
+export type {
+  ElasticsearchError,
+  LicensingApiRequestHandlerContext,
+  LicensingPluginSetup,
+  LicensingPluginStart,
+} from './types';
+
 export { config } from './licensing_config';
-export { CheckLicense, wrapRouteWithLicenseCheck } from './wrap_route_with_license_check';
+
+export type { CheckLicense } from './wrap_route_with_license_check';
+export { wrapRouteWithLicenseCheck } from './wrap_route_with_license_check';
diff --git a/x-pack/plugins/licensing/server/services/index.ts b/x-pack/plugins/licensing/server/services/index.ts
@@ -5,8 +5,5 @@
  * 2.0.
  */
 
-export {
-  FeatureUsageService,
-  FeatureUsageServiceSetup,
-  FeatureUsageServiceStart,
-} from './feature_usage_service';
+export { FeatureUsageService } from './feature_usage_service';
+export type { FeatureUsageServiceSetup, FeatureUsageServiceStart } from './feature_usage_service';
diff --git a/x-pack/plugins/licensing/tsconfig.json b/x-pack/plugins/licensing/tsconfig.json
@@ -4,7 +4,8 @@
     "outDir": "./target/types",
     "emitDeclarationOnly": true,
     "declaration": true,
-    "declarationMap": true
+    "declarationMap": true,
+    "isolatedModules": true,
   },
   "include": [
     "public/**/*",