Move flipper plugin from flipper-lib types to flipper-common

Summary: Moved all types related to plugin descriptions from plugin-lib (which handles downloads and such) to flipper-common. The goal of that is to remove all plugin-lib usage from ui-core to server-core, so that the UI itself doesn't do any file operations anymore related to plugins. That will be done in next diffs, this just moves types but no code.

Reviewed By: nikoant, aigoncharov

Differential Revision: D32665064

fbshipit-source-id: 86d908e7264569b0229b09290a891171876c8e00
This commit is contained in:
Michel Weststrate
2021-12-08 04:25:28 -08:00
committed by Facebook GitHub Bot
parent 2bf8ae2364
commit e7f841b6d2
46 changed files with 72 additions and 72 deletions

View File

@@ -41,11 +41,10 @@ import {
} from './utils/pluginUtils';
import {ContentContainer} from './sandy-chrome/ContentContainer';
import {Alert, Typography} from 'antd';
import {InstalledPluginDetails} from 'flipper-plugin-lib';
import semver from 'semver';
import {loadPlugin} from './reducers/pluginManager';
import {produce} from 'immer';
import {reportUsage} from 'flipper-common';
import {reportUsage, InstalledPluginDetails} from 'flipper-common';
import {PluginInfo} from './chrome/fb-stubs/PluginInfo';
import {getActiveClient, getActivePlugin} from './selectors/connections';
import {AnyAction} from 'redux';

View File

@@ -13,10 +13,7 @@ import {
PlusOutlined,
} from '@ant-design/icons';
import {Alert, Button} from 'antd';
import {
BundledPluginDetails,
DownloadablePluginDetails,
} from 'flipper-plugin-lib';
import {BundledPluginDetails, DownloadablePluginDetails} from 'flipper-common';
import React, {useMemo} from 'react';
import {useCallback} from 'react';
import {useDispatch, useSelector} from 'react-redux';

View File

@@ -7,7 +7,7 @@
* @format
*/
import {PluginDetails} from 'flipper-plugin-lib';
import {PluginDetails} from 'flipper-common';
import {Layout} from 'flipper-plugin';
import Client from '../../Client';
import {TableBodyRow} from '../../ui/components/table/types';

View File

@@ -10,7 +10,11 @@
import {Layout, theme} from 'flipper-plugin';
import {LoadingIndicator, TableRows, ManagedTable, Glyph} from '../../ui';
import React, {useCallback, useState, useEffect} from 'react';
import {reportPlatformFailures, reportUsage} from 'flipper-common';
import {
reportPlatformFailures,
reportUsage,
InstalledPluginDetails,
} from 'flipper-common';
import reloadFlipper from '../../utils/reloadFlipper';
import {registerInstalledPlugins} from '../../reducers/plugins';
import {
@@ -19,7 +23,6 @@ import {
getUpdatablePlugins,
removePlugin,
UpdatablePluginDetails,
InstalledPluginDetails,
} from 'flipper-plugin-lib';
import {installPluginFromNpm} from 'flipper-plugin-lib';
import {State as AppState} from '../../reducers';

View File

@@ -14,7 +14,7 @@ import React from 'react';
import {render, waitFor} from '@testing-library/react';
import configureStore from 'redux-mock-store';
import {Provider} from 'react-redux';
import type {PluginDetails} from 'flipper-plugin-lib';
import type {PluginDetails} from 'flipper-common';
import {getUpdatablePlugins, UpdatablePluginDetails} from 'flipper-plugin-lib';
import {Store} from '../../../reducers';
import {mocked} from 'ts-jest/utils';

View File

@@ -24,7 +24,7 @@ import {
DeviceDescription,
FlipperServer,
} from 'flipper-common';
import {DeviceSpec, PluginDetails} from 'flipper-plugin-lib';
import {DeviceSpec, PluginDetails} from 'flipper-common';
import {getPluginKey} from '../utils/pluginKey';
import {Base64} from 'js-base64';

View File

@@ -16,7 +16,7 @@ import dispatcher, {
createRequirePluginFunction,
getLatestCompatibleVersionOfEachPlugin,
} from '../plugins';
import {BundledPluginDetails, InstalledPluginDetails} from 'flipper-plugin-lib';
import {BundledPluginDetails, InstalledPluginDetails} from 'flipper-common';
import path from 'path';
import {createRootReducer, State} from '../../reducers/index';
import {getLogger} from 'flipper-common';

View File

@@ -8,12 +8,14 @@
*/
import {
DownloadablePluginDetails,
getInstalledPluginDetails,
getPluginVersionInstallationDir,
InstalledPluginDetails,
installPluginFromFile,
} from 'flipper-plugin-lib';
import {
InstalledPluginDetails,
DownloadablePluginDetails,
} from 'flipper-common';
import {State, Store} from '../reducers/index';
import {
PluginDownloadStatus,

View File

@@ -8,7 +8,7 @@
*/
import type {Store} from '../reducers/index';
import type {Logger} from 'flipper-common';
import type {Logger, ActivatablePluginDetails} from 'flipper-common';
import {
LoadPluginActionPayload,
UninstallPluginActionPayload,
@@ -21,7 +21,6 @@ import {
getInstalledPlugins,
cleanupOldInstalledPluginVersions,
removePlugins,
ActivatablePluginDetails,
} from 'flipper-plugin-lib';
import {sideEffect} from '../utils/sideEffect';
import {requirePlugin} from './plugins';

View File

@@ -32,7 +32,7 @@ import {
ActivatablePluginDetails,
BundledPluginDetails,
ConcretePluginDetails,
} from 'flipper-plugin-lib';
} from 'flipper-common';
import {tryCatchReportPluginFailures, reportUsage} from 'flipper-common';
import * as FlipperPluginSDK from 'flipper-plugin';
import {_SandyPluginDefinition} from 'flipper-plugin';

View File

@@ -7,14 +7,13 @@
* @format
*/
import {Logger, Settings} from 'flipper-common';
import {Logger, Settings, ActivatablePluginDetails} from 'flipper-common';
import Client from './Client';
import {Component} from 'react';
import BaseDevice from './devices/BaseDevice';
import {StaticView} from './reducers/connections';
import {State as ReduxState} from './reducers';
import {DEFAULT_MAX_QUEUE_SIZE} from './reducers/pluginMessageQueue';
import {ActivatablePluginDetails} from 'flipper-plugin-lib';
import {
Notification,
Idler,

View File

@@ -14,7 +14,7 @@ import {
registerInstalledPlugins,
} from '../plugins';
import {FlipperPlugin, FlipperDevicePlugin, BaseAction} from '../../plugin';
import {InstalledPluginDetails} from 'flipper-plugin-lib';
import {InstalledPluginDetails} from 'flipper-common';
import {wrapSandy} from '../../test-utils/createMockFlipperWithPlugin';
const testPluginOrig = class extends FlipperPlugin<any, BaseAction, any> {

View File

@@ -7,10 +7,8 @@
* @format
*/
import {
DownloadablePluginDetails,
getPluginVersionInstallationDir,
} from 'flipper-plugin-lib';
import {DownloadablePluginDetails} from 'flipper-common';
import {getPluginVersionInstallationDir} from 'flipper-plugin-lib';
import {Actions} from '.';
import produce from 'immer';
import {Canceler} from 'axios';

View File

@@ -8,7 +8,7 @@
*/
import type {Actions} from './';
import type {ActivatablePluginDetails} from 'flipper-plugin-lib';
import type {ActivatablePluginDetails} from 'flipper-common';
import type {PluginDefinition} from '../plugin';
import {produce} from 'immer';

View File

@@ -17,7 +17,7 @@ import type {
ActivatablePluginDetails,
BundledPluginDetails,
InstalledPluginDetails,
} from 'flipper-plugin-lib';
} from 'flipper-common';
import type {Actions} from '.';
import produce from 'immer';
import {isDevicePluginDefinition} from '../utils/pluginUtils';

View File

@@ -24,7 +24,7 @@ import {getPluginTitle, getPluginTooltip} from '../../utils/pluginUtils';
import {selectPlugin} from '../../reducers/connections';
import Client from '../../Client';
import BaseDevice from '../../devices/BaseDevice';
import {DownloadablePluginDetails} from 'flipper-plugin-lib';
import {DownloadablePluginDetails} from 'flipper-common';
import {
DownloadablePluginState,
PluginDownloadStatus,
@@ -35,7 +35,7 @@ import {
switchPlugin,
uninstallPlugin,
} from '../../reducers/pluginManager';
import {BundledPluginDetails} from 'flipper-plugin-lib';
import {BundledPluginDetails} from 'flipper-common';
import {reportUsage} from 'flipper-common';
import ConnectivityStatus from './fb-stubs/ConnectivityStatus';
import {useSelector} from 'react-redux';

View File

@@ -23,7 +23,7 @@ import {registerPlugins} from '../reducers/plugins';
import {getLogger} from 'flipper-common';
import {initializeFlipperLibImplementation} from '../utils/flipperLibImplementation';
import pluginManager from '../dispatcher/pluginManager';
import {PluginDetails} from 'flipper-plugin-lib';
import {PluginDetails} from 'flipper-common';
import ArchivedDevice from '../devices/ArchivedDevice';
import {ClientQuery, DeviceOS} from 'flipper-common';
import {TestDevice} from './TestDevice';

View File

@@ -8,7 +8,7 @@
*/
import {DeviceOS, DeviceType} from 'flipper-plugin';
import {DeviceSpec} from 'flipper-plugin-lib';
import {DeviceSpec} from 'flipper-common';
import BaseDevice from '../devices/BaseDevice';
export class TestDevice extends BaseDevice {

View File

@@ -7,7 +7,7 @@
* @format
*/
import {PluginDetails} from 'flipper-plugin-lib';
import {PluginDetails} from 'flipper-common';
import semver from 'semver';
import {getRenderHostInstance} from '../RenderHost';
import {getAppVersion} from './info';

View File

@@ -7,7 +7,7 @@
* @format
*/
import {ConcretePluginDetails} from 'flipper-plugin-lib';
import {ConcretePluginDetails} from 'flipper-common';
import semver from 'semver';
import isPluginCompatible from './isPluginCompatible';

View File

@@ -12,10 +12,10 @@ import fs from 'fs-extra';
import {
getSourcePlugins,
moveInstalledPluginsFromLegacyDir,
InstalledPluginDetails,
getAllInstalledPluginVersions,
getAllInstalledPluginsInDir,
} from 'flipper-plugin-lib';
import {InstalledPluginDetails} from 'flipper-common';
import {getStaticPath} from '../utils/pathUtils';
// Load "dynamic" plugins, e.g. those which are either pre-installed (default), installed or loaded from sources (for development).

View File

@@ -17,7 +17,7 @@ import type {
BundledPluginDetails,
DownloadablePluginDetails,
PluginDetails,
} from 'flipper-plugin-lib';
} from 'flipper-common';
import {getLatestCompatibleVersionOfEachPlugin} from '../dispatcher/plugins';
import {getPluginKey} from './pluginKey';

View File

@@ -10,7 +10,7 @@
import {
ActivatablePluginDetails,
DownloadablePluginDetails,
} from 'flipper-plugin-lib';
} from 'flipper-common';
export function createMockDownloadablePluginDetails(
params: {