diff --git a/desktop/flipper-common/src/PluginDetails.tsx b/desktop/flipper-common/src/PluginDetails.tsx index 458c9cdaa..597ae4882 100644 --- a/desktop/flipper-common/src/PluginDetails.tsx +++ b/desktop/flipper-common/src/PluginDetails.tsx @@ -109,6 +109,10 @@ export interface DownloadablePluginDetails extends ConcretePluginDetails { isEnabledByDefault: boolean; } +export interface MarketplacePluginDetails extends DownloadablePluginDetails { + availableVersions?: DownloadablePluginDetails[]; +} + export type UpdateResult = | {kind: 'not-installed'; version: string} | {kind: 'up-to-date'} diff --git a/desktop/flipper-ui-core/src/dispatcher/pluginMarketplace.tsx b/desktop/flipper-ui-core/src/dispatcher/pluginMarketplace.tsx index 3920e799f..0265f0892 100644 --- a/desktop/flipper-ui-core/src/dispatcher/pluginMarketplace.tsx +++ b/desktop/flipper-ui-core/src/dispatcher/pluginMarketplace.tsx @@ -9,12 +9,12 @@ import {Store} from '../reducers/index'; import {loadAvailablePlugins} from '../fb-stubs/pluginMarketplaceAPI'; -import { - MarketplacePluginDetails, - registerMarketplacePlugins, -} from '../reducers/plugins'; +import {registerMarketplacePlugins} from '../reducers/plugins'; import {getFlipperLib} from 'flipper-plugin'; -import {DownloadablePluginDetails} from 'flipper-common'; +import { + DownloadablePluginDetails, + MarketplacePluginDetails, +} from 'flipper-common'; import semver from 'semver'; import {startPluginDownload} from '../reducers/pluginDownloads'; import {sideEffect} from '../utils/sideEffect'; diff --git a/desktop/flipper-ui-core/src/dispatcher/plugins.tsx b/desktop/flipper-ui-core/src/dispatcher/plugins.tsx index 2e6e3325f..ffda1f1c5 100644 --- a/desktop/flipper-ui-core/src/dispatcher/plugins.tsx +++ b/desktop/flipper-ui-core/src/dispatcher/plugins.tsx @@ -8,7 +8,7 @@ */ import type {Store} from '../reducers/index'; -import {Logger} from 'flipper-common'; +import {Logger, MarketplacePluginDetails} from 'flipper-common'; import {PluginDefinition} from '../plugin'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -22,7 +22,6 @@ import { registerLoadedPlugins, registerBundledPlugins, registerMarketplacePlugins, - MarketplacePluginDetails, pluginsInitialized, } from '../reducers/plugins'; import {FlipperBasePlugin} from '../plugin'; diff --git a/desktop/flipper-ui-core/src/fb-stubs/pluginMarketplaceAPI.tsx b/desktop/flipper-ui-core/src/fb-stubs/pluginMarketplaceAPI.tsx index 9d28dc021..69e7940cc 100644 --- a/desktop/flipper-ui-core/src/fb-stubs/pluginMarketplaceAPI.tsx +++ b/desktop/flipper-ui-core/src/fb-stubs/pluginMarketplaceAPI.tsx @@ -7,7 +7,7 @@ * @format */ -import {MarketplacePluginDetails} from '../reducers/plugins'; +import {MarketplacePluginDetails} from 'flipper-common'; import {Store} from '../reducers/index'; export async function loadAvailablePlugins( diff --git a/desktop/flipper-ui-core/src/reducers/plugins.tsx b/desktop/flipper-ui-core/src/reducers/plugins.tsx index a6b60577f..a2939688e 100644 --- a/desktop/flipper-ui-core/src/reducers/plugins.tsx +++ b/desktop/flipper-ui-core/src/reducers/plugins.tsx @@ -17,16 +17,13 @@ import type { ActivatablePluginDetails, BundledPluginDetails, InstalledPluginDetails, + MarketplacePluginDetails, } from 'flipper-common'; import type {Actions} from '.'; import produce from 'immer'; import {isDevicePluginDefinition} from '../utils/pluginUtils'; import semver from 'semver'; -export interface MarketplacePluginDetails extends DownloadablePluginDetails { - availableVersions?: DownloadablePluginDetails[]; -} - export type State = StateV1; type StateV1 = {