From 4c638cf05bb905cde395b71a9529c9b44edc56dd Mon Sep 17 00:00:00 2001
From: bnechyporenko <bnechyporenko@bol.com>
Date: Thu, 7 Jul 2022 09:37:10 +0200
Subject: [PATCH] Incorporated the feedback.

Signed-off-by: bnechyporenko <bnechyporenko@bol.com>
---
 packages/core-plugin-api/src/plugin/Plugin.tsx | 10 +---------
 packages/core-plugin-api/src/plugin/types.ts   |  3 +--
 plugins/catalog-customized/src/index.ts        |  1 +
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/core-plugin-api/src/plugin/Plugin.tsx b/packages/core-plugin-api/src/plugin/Plugin.tsx
index 6c5963d3f0..f081d03fa5 100644
--- a/packages/core-plugin-api/src/plugin/Plugin.tsx
+++ b/packages/core-plugin-api/src/plugin/Plugin.tsx
@@ -29,7 +29,6 @@ import { AnyApiFactory } from '../apis';
  */
 export class PluginImpl<
   PluginInputOptions extends {},
-  PluginOptions extends {},
   Routes extends AnyRoutes,
   ExternalRoutes extends AnyExternalRoutes,
 > implements BackstagePlugin<PluginInputOptions, Routes, ExternalRoutes>
@@ -37,7 +36,6 @@ export class PluginImpl<
   constructor(
     private readonly config: PluginConfig<
       PluginInputOptions,
-      PluginOptions,
       Routes,
       ExternalRoutes
     >,
@@ -95,16 +93,10 @@ export class PluginImpl<
  */
 export function createPlugin<
   PluginInputOptions extends {},
-  PluginOptions extends {},
   Routes extends AnyRoutes = {},
   ExternalRoutes extends AnyExternalRoutes = {},
 >(
-  config: PluginConfig<
-    PluginInputOptions,
-    PluginOptions,
-    Routes,
-    ExternalRoutes
-  >,
+  config: PluginConfig<PluginInputOptions, Routes, ExternalRoutes>,
 ): BackstagePlugin<PluginInputOptions, Routes, ExternalRoutes> {
   return new PluginImpl(config);
 }
diff --git a/packages/core-plugin-api/src/plugin/types.ts b/packages/core-plugin-api/src/plugin/types.ts
index 51e75ff416..eee38465cc 100644
--- a/packages/core-plugin-api/src/plugin/types.ts
+++ b/packages/core-plugin-api/src/plugin/types.ts
@@ -83,7 +83,6 @@ export type PluginFeatureFlagConfig = {
  */
 export type PluginConfig<
   PluginInputOptions extends {},
-  PluginOptions extends {},
   Routes extends AnyRoutes,
   ExternalRoutes extends AnyExternalRoutes,
 > = {
@@ -92,7 +91,7 @@ export type PluginConfig<
   routes?: Routes;
   externalRoutes?: ExternalRoutes;
   featureFlags?: PluginFeatureFlagConfig[];
-  __experimentalConfigure?(options?: PluginInputOptions): PluginOptions;
+  __experimentalConfigure?(options?: PluginInputOptions): {};
 };
 
 /**
diff --git a/plugins/catalog-customized/src/index.ts b/plugins/catalog-customized/src/index.ts
index 095842e9ac..cc8aefeaa6 100644
--- a/plugins/catalog-customized/src/index.ts
+++ b/plugins/catalog-customized/src/index.ts
@@ -13,5 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import './plugin';
 
 export * from '@backstage/plugin-catalog';