Revert "CONSOLE-3769: Remove type reexports from plugin-sdk"

logonoff · logonoff · commit d0c0da12648f · 2025-11-25T15:11:17.000-05:00
This reverts commit ece51f7.
diff --git a/frontend/packages/console-app/src/__tests__/plugin-test-utils.ts b/frontend/packages/console-app/src/__tests__/plugin-test-utils.ts
@@ -1,9 +1,9 @@
 import { List as ImmutableList } from 'immutable';
 import * as _ from 'lodash';
 import type { ExtensionDeclaration } from '@console/dynamic-plugin-sdk/src/types';
+import { PluginStore } from '@console/plugin-sdk';
 import { loadActivePluginsForTestPurposes } from '@console/plugin-sdk/src/codegen/active-plugins';
 import { resolvePluginPackages } from '@console/plugin-sdk/src/codegen/plugin-resolver';
-import { PluginStore } from '@console/plugin-sdk/src/store';
 
 const testedPlugins = loadActivePluginsForTestPurposes(resolvePluginPackages());
 const testedPluginStore = new PluginStore(testedPlugins);
diff --git a/frontend/packages/console-app/src/components/dashboards-page/dynamic-plugins-health-resource/NotLoadedDynamicPlugins.tsx b/frontend/packages/console-app/src/components/dashboards-page/dynamic-plugins-health-resource/NotLoadedDynamicPlugins.tsx
@@ -3,7 +3,7 @@ import { StackItem, Content } from '@patternfly/react-core';
 import { ResourceLink } from '@console/internal/components/utils/resource-link';
 import { ConsolePluginModel } from '@console/internal/models';
 import { referenceForModel } from '@console/internal/module/k8s';
-import { NotLoadedDynamicPluginInfo } from '@console/plugin-sdk/src/store';
+import { NotLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
 import { StatusPopupSection } from '@console/shared/src/components/dashboard/status-card/StatusPopup';
 
 const NotLoadedDynamicPlugins: React.FC<NotLoadedDynamicPluginsProps> = ({ plugins, label }) => (
diff --git a/frontend/packages/console-app/src/components/detect-perspective/__tests__/PerspectiveDetector.spec.tsx b/frontend/packages/console-app/src/components/detect-perspective/__tests__/PerspectiveDetector.spec.tsx
@@ -1,7 +1,7 @@
 import { render, waitFor } from '@testing-library/react';
 import { useLocation } from 'react-router-dom-v5-compat';
 import { Perspective } from '@console/dynamic-plugin-sdk';
-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
+import { LoadedExtension } from '@console/plugin-sdk';
 import { usePerspectives } from '@console/shared/src';
 import {
   Perspective as PerspectiveType,
diff --git a/frontend/packages/console-app/src/components/nav/useNavExtensionForPerspective.ts b/frontend/packages/console-app/src/components/nav/useNavExtensionForPerspective.ts
@@ -1,6 +1,6 @@
 import { useMemo, useCallback } from 'react';
 import { NavExtension, isNavExtension } from '@console/dynamic-plugin-sdk/src/lib-core';
-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
+import { LoadedExtension } from '@console/plugin-sdk';
 import { useExtensions } from '@console/plugin-sdk/src/api/useExtensions';
 import { usePerspectives } from '@console/shared/src';
 
diff --git a/frontend/packages/console-app/src/components/user-preferences/perspective/PreferredPerspectiveSelect.tsx b/frontend/packages/console-app/src/components/user-preferences/perspective/PreferredPerspectiveSelect.tsx
@@ -8,7 +8,7 @@ import {
 } from '@patternfly/react-core';
 import { useTranslation } from 'react-i18next';
 import { Perspective } from '@console/dynamic-plugin-sdk/src/extensions';
-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
+import { LoadedExtension } from '@console/plugin-sdk/src';
 import { usePerspectiveExtension, usePerspectives } from '@console/shared/src';
 import { useTelemetry } from '@console/shared/src/hooks/useTelemetry';
 import {
diff --git a/frontend/packages/console-app/src/components/user-preferences/perspective/__tests__/perspective.data.ts b/frontend/packages/console-app/src/components/user-preferences/perspective/__tests__/perspective.data.ts
@@ -1,6 +1,6 @@
 import { ACM_PERSPECTIVE_ID } from '@console/app/src/consts';
 import { Perspective } from '@console/dynamic-plugin-sdk';
-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
+import { LoadedExtension } from '@console/plugin-sdk';
 
 export const mockPerspectiveExtensions: LoadedExtension<Perspective>[] = [
   {
diff --git a/frontend/packages/console-dynamic-plugin-sdk/CHANGELOG-core.md b/frontend/packages/console-dynamic-plugin-sdk/CHANGELOG-core.md
@@ -12,21 +12,14 @@ table in [Console dynamic plugins README](./README.md).
 
 ## 4.21.0-prerelease.x - TBD
 
-- **Deprecated** `setPluginStore` function in `k8s-utils.ts`. The function is now a noop and the export
+- Deprecated `setPluginStore` function in `k8s-utils.ts`. The function is now a noop and the export
   will be removed in a future release. ([CONSOLE-4840], [#15671])
-- **Type-only breaking change**: Fix `popupComponent` prop type in extension `console.dashboards/overview/health/resource` ([CONSOLE-4796], [#15526])
-- Increased alignment with `@openshift/dynamic-plugin-sdk` types ([CONSOLE-3769], [#15509], [#15738])
-  - `AlwaysOnExtension` and `ModelDefinition` types are removed from `api/common-types` because they referred
-    to a legacy system which console dynamic plugins never supported. There is no direct replacement for these
-    types, and plugins should remove all uses of them. ([#15671])
-  - The following types are now re-exported from `@openshift/dynamic-plugin-sdk` instead of being defined
-    locally: `ExtensionFlags`, `ExtensionTypeGuard`, `ResolvedCodeRefProperties`, `RemoteEntryModule`, and `Update`. ([#15509], [#15738])
+- Fix `popupComponent` prop type in extension `console.dashboards/overview/health/resource` ([CONSOLE-4796], [#15526])
+- Begin alignment of plugin SDK types with `@openshift/dynamic-plugin-sdk` ([CONSOLE-3769], [#15509])
 - Add optional `fetch` property to extension `console.dashboards/overview/health/url` ([CONSOLE-4796], [#15526])
 - Add optional `infrastructure` parameter to `PrometheusHealthHandler` type ([CONSOLE-4796], [#15526])
 - Allow `K8sResourceKind` in `TopologyDataObject`, `TopologyResourcesObject`, and `OverviewItem` types ([CONSOLE-4840], [#15699])
 - Allow async functions for the `resources` property of `console.topology/data/factory` extension ([CONSOLE-4806], [#15641])
-- Add color theme and font size customization to `ResourceYAMLEditor` component ([CONSOLE-4701], [#15735])
-- Ensure proper pass-through of `props.editorProps.theme` and `props.options.fontFamily` to `CodeEditor` component ([CONSOLE-4701], [#15735])
 
 ## 4.20.0 - 2025-11-24
 
@@ -152,7 +145,6 @@ table in [Console dynamic plugins README](./README.md).
 [CONSOLE-4576]: https://issues.redhat.com/browse/CONSOLE-4576
 [CONSOLE-4654]: https://issues.redhat.com/browse/CONSOLE-4654
 [CONSOLE-4656]: https://issues.redhat.com/browse/CONSOLE-4656
-[CONSOLE-4701]: https://issues.redhat.com/browse/CONSOLE-4701
 [CONSOLE-4796]: https://issues.redhat.com/browse/CONSOLE-4796
 [CONSOLE-4806]: https://issues.redhat.com/browse/CONSOLE-4806
 [CONSOLE-4840]: https://issues.redhat.com/browse/CONSOLE-4840
@@ -220,5 +212,3 @@ table in [Console dynamic plugins README](./README.md).
 [#15641]: https://github.com/openshift/console/pull/15641
 [#15671]: https://github.com/openshift/console/pull/15671
 [#15699]: https://github.com/openshift/console/pull/15699
-[#15735]: https://github.com/openshift/console/pull/15735
-[#15738]: https://github.com/openshift/console/pull/15738
diff --git a/frontend/packages/console-plugin-sdk/src/api/pluginSubscriptionService.ts b/frontend/packages/console-plugin-sdk/src/api/pluginSubscriptionService.ts
@@ -1,12 +1,8 @@
 import * as _ from 'lodash';
 import { Store } from 'redux';
-import type {
-  Extension,
-  ExtensionTypeGuard,
-  LoadedExtension,
-} from '@console/dynamic-plugin-sdk/src/types';
 import type { RootState } from '@console/internal/redux';
 import { isExtensionInUse, PluginStore, DynamicPluginInfo } from '../store';
+import type { Extension, ExtensionTypeGuard, LoadedExtension } from '../typings';
 
 let subscriptionServiceInitialized = false;
 let getPluginStoreInstance: () => PluginStore = () => undefined;
diff --git a/frontend/packages/console-plugin-sdk/src/api/useExtensions.ts b/frontend/packages/console-plugin-sdk/src/api/useExtensions.ts
@@ -1,11 +1,7 @@
 import { useRef, useCallback, useEffect } from 'react';
 import * as _ from 'lodash';
-import type {
-  Extension,
-  ExtensionTypeGuard,
-  LoadedExtension,
-} from '@console/dynamic-plugin-sdk/src/types';
 import { useForceRender } from '@console/shared/src/hooks/useForceRender';
+import type { Extension, ExtensionTypeGuard, LoadedExtension } from '../typings';
 import { useTranslatedExtensions } from '../utils/useTranslatedExtensions';
 import { subscribeToExtensions } from './pluginSubscriptionService';
 
diff --git a/frontend/packages/console-plugin-sdk/src/codegen/active-plugins.ts b/frontend/packages/console-plugin-sdk/src/codegen/active-plugins.ts
@@ -7,12 +7,12 @@ import {
 } from '@console/dynamic-plugin-sdk/src/coderefs/coderef-resolver';
 import { extensionsFile } from '@console/dynamic-plugin-sdk/src/constants';
 import { ConsoleExtensionsJSON } from '@console/dynamic-plugin-sdk/src/schema/console-extensions';
-import { Extension, EncodedCodeRef } from '@console/dynamic-plugin-sdk/src/types';
+import { EncodedCodeRef } from '@console/dynamic-plugin-sdk/src/types';
 import { parseJSONC } from '@console/dynamic-plugin-sdk/src/utils/jsonc';
 import { guessModuleFilePath } from '@console/dynamic-plugin-sdk/src/validation/ExtensionValidator';
 import { ValidationResult } from '@console/dynamic-plugin-sdk/src/validation/ValidationResult';
 import { validateConsoleExtensionsFileSchema } from '@console/dynamic-plugin-sdk/src/webpack/ConsoleRemotePlugin';
-import { ActivePlugin } from '../typings/base';
+import { Extension, ActivePlugin } from '../typings';
 import { trimStartMultiLine } from '../utils/string';
 import { consolePkgScope, PluginPackage } from './plugin-resolver';
 
diff --git a/frontend/packages/console-plugin-sdk/src/index.ts b/frontend/packages/console-plugin-sdk/src/index.ts
@@ -0,0 +1,3 @@
+// TODO(vojtech): this barrel file can cause a lot of cycles, it's best to remove it
+export * from './typings';
+export * from './store';
diff --git a/frontend/packages/console-plugin-sdk/src/store.ts b/frontend/packages/console-plugin-sdk/src/store.ts
@@ -2,8 +2,7 @@
 
 import * as _ from 'lodash';
 import { StandardConsolePluginManifest } from '@console/dynamic-plugin-sdk/src/build-types';
-import { Extension, LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
-import { ActivePlugin } from './typings/base';
+import { Extension, LoadedExtension, ActivePlugin } from './typings';
 
 export const sanitizeExtension = <E extends Extension>(e: E): E => {
   e.flags = e.flags || {};
diff --git a/frontend/packages/console-plugin-sdk/src/typings/index.ts b/frontend/packages/console-plugin-sdk/src/typings/index.ts
@@ -0,0 +1 @@
+export * from './base';
diff --git a/frontend/packages/console-plugin-sdk/src/utils/extension-i18n.ts b/frontend/packages/console-plugin-sdk/src/utils/extension-i18n.ts
@@ -1,10 +1,10 @@
 import { TFunction } from 'i18next';
-import type { Extension } from '@console/dynamic-plugin-sdk/src/types';
 import {
   deepForOwn,
   PredicateCheck,
   ValueCallback,
 } from '@console/dynamic-plugin-sdk/src/utils/object';
+import type { Extension } from '../typings';
 
 export const isTranslatableString = (value): value is string => {
   return (
diff --git a/frontend/packages/console-shared/src/components/actions/__tests__/utils-test-data.ts b/frontend/packages/console-shared/src/components/actions/__tests__/utils-test-data.ts
@@ -1,5 +1,5 @@
 import { Action, ActionGroup } from '@console/dynamic-plugin-sdk';
-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
+import { LoadedExtension } from '@console/plugin-sdk';
 
 export const mockActions: Action[] = [
   {
diff --git a/frontend/packages/console-shared/src/components/actions/utils.ts b/frontend/packages/console-shared/src/components/actions/utils.ts
@@ -5,7 +5,7 @@ import {
   MenuOption,
   MenuOptionType,
 } from '@console/dynamic-plugin-sdk';
-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
+import { LoadedExtension } from '@console/plugin-sdk';
 
 export const createMenuOptions = (
   actions: Action[],
diff --git a/frontend/packages/console-shared/src/hooks/create-resource-hook.ts b/frontend/packages/console-shared/src/hooks/create-resource-hook.ts
@@ -1,7 +1,7 @@
 import { useCallback } from 'react';
 import { isCreateResource, CreateResource, GroupVersionKind } from '@console/dynamic-plugin-sdk';
-import { Extension, LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
 import { referenceForExtensionModel } from '@console/internal/module/k8s';
+import { Extension, LoadedExtension } from '@console/plugin-sdk';
 import { useExtensions } from '@console/plugin-sdk/src/api/useExtensions';
 
 export const useCreateResourceExtension = (
diff --git a/frontend/packages/console-shared/src/hooks/perspective-utils.ts b/frontend/packages/console-shared/src/hooks/perspective-utils.ts
@@ -6,7 +6,7 @@ import {
   AccessReviewResourceAttributes,
   checkAccess,
 } from '@console/dynamic-plugin-sdk';
-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
+import { LoadedExtension } from '@console/plugin-sdk/src';
 import { useExtensions } from '@console/plugin-sdk/src/api/useExtensions';
 import { USERSETTINGS_PREFIX } from '../constants';
 
diff --git a/frontend/packages/console-shared/src/utils/sample-utils.ts b/frontend/packages/console-shared/src/utils/sample-utils.ts
@@ -11,7 +11,6 @@ import {
   isPerspective,
   Perspective,
 } from '@console/dynamic-plugin-sdk';
-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
 import { FirehoseResult } from '@console/internal/components/utils/types';
 import {
   BuildConfigModel,
@@ -28,6 +27,7 @@ import {
   K8sResourceKind,
   referenceForModel,
 } from '@console/internal/module/k8s';
+import { LoadedExtension } from '@console/plugin-sdk/src';
 import { subscribeToExtensions } from '@console/plugin-sdk/src/api/pluginSubscriptionService';
 import { defaultCatalogCategories } from './default-categories';
 
diff --git a/frontend/packages/dev-console/src/components/add/AddCardSection.tsx b/frontend/packages/dev-console/src/components/add/AddCardSection.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AddActionGroup, ResolvedExtension, AddAction } from '@console/dynamic-plugin-sdk';
-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
+import { LoadedExtension } from '@console/plugin-sdk/src';
 import { orderExtensionBasedOnInsertBeforeAndAfter } from '@console/shared/';
 import { getAddGroups } from '../../utils/add-page-utils';
 import { AddGroup } from '../types';
diff --git a/frontend/packages/dev-console/src/components/add/__tests__/add-page-test-data.tsx b/frontend/packages/dev-console/src/components/add/__tests__/add-page-test-data.tsx
@@ -1,10 +1,10 @@
 import { CatalogIcon } from '@patternfly/react-icons/dist/esm/icons/catalog-icon';
 import { SignOutAltIcon } from '@patternfly/react-icons/dist/esm/icons/sign-out-alt-icon';
 import { AddActionGroup, ResolvedExtension, AddAction } from '@console/dynamic-plugin-sdk';
-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
 import { helmCatalogIconSVG } from '@console/helm-plugin/src/utils/icons';
 import { channelIconSVG } from '@console/knative-plugin/src/utils/icons';
 import { pipelineIconSVG } from '@console/pipelines-plugin/src/utils/icons';
+import { LoadedExtension } from '@console/plugin-sdk/src';
 
 type AddActionExtension = ResolvedExtension<AddAction>;
 type AddActionGroupExtension = LoadedExtension<AddActionGroup>;
diff --git a/frontend/public/components/notification-drawer.tsx b/frontend/public/components/notification-drawer.tsx
@@ -14,7 +14,7 @@ import { useTranslation } from 'react-i18next';
 import i18next from 'i18next';
 import { useDispatch } from 'react-redux';
 import { Link, NavigateFunction, useNavigate } from 'react-router-dom-v5-compat';
-import type { DynamicPluginInfo } from '@console/plugin-sdk/src/store';
+import { DynamicPluginInfo } from '@console/plugin-sdk';
 import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
 import * as UIActions from '@console/internal/actions/ui';
 import { resourcePath } from '@console/internal/components/utils/resource-link';
diff --git a/frontend/public/module/k8s/__tests__/get-resources.spec.ts b/frontend/public/module/k8s/__tests__/get-resources.spec.ts
@@ -1,5 +1,5 @@
 import { ModelMetadata } from '@console/dynamic-plugin-sdk';
-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
+import { LoadedExtension } from '@console/plugin-sdk';
 import { pluralizeKind, getModelExtensionMetadata } from '../get-resources';
 
 describe('pluralizeKind', () => {
diff --git a/frontend/public/plugins.ts b/frontend/public/plugins.ts
@@ -1,6 +1,6 @@
 import * as _ from 'lodash-es';
 import { PluginStore } from '@console/plugin-sdk/src/store';
-import { ActivePlugin } from '@console/plugin-sdk/src/typings/base';
+import { ActivePlugin } from '@console/plugin-sdk/src/typings';
 import { getURLSearchParams } from './components/utils/link';
 
 const getEnabledDynamicPluginNames = () => {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { ACM_PERSPECTIVE_ID } from '@console/app/src/consts';`
`2`	`2`	`import { Perspective } from '@console/dynamic-plugin-sdk';`
`3`		`-import { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';`
	`3`	`+import { LoadedExtension } from '@console/plugin-sdk';`
`4`	`4`
`5`	`5`	`export const mockPerspectiveExtensions: LoadedExtension<Perspective>[] = [`
`6`	`6`	`{`