Move files to flipper-common

Summary: Moved Logger, sleep, timeout and server contract types to flipper-common packages.

Reviewed By: passy

Differential Revision: D31475790

fbshipit-source-id: 42d2147698875f9e919ad5250f9953f3bff3ec2d

desktop/app/package.json

@@ -34,6 +34,7 @@
     "crc32": "^0.2.2",
     "deep-equal": "^2.0.5",
     "expand-tilde": "^2.0.2",
+    "flipper-common": "0.0.0",
     "flipper-client-sdk": "^0.0.3",
     "flipper-doctor": "0.0.0",
     "flipper-plugin": "0.0.0",

desktop/app/src/Client.tsx

@@ -12,7 +12,7 @@
 
 import {PluginDefinition} from './plugin';
 import BaseDevice from './devices/BaseDevice';
-import {Logger} from './fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {Store} from './reducers/index';
 import {performance} from 'perf_hooks';
 import {reportPluginFailures} from './utils/metrics';
@@ -26,15 +26,17 @@ import {processMessagesLater} from './utils/messageQueue';
 import {emitBytesReceived} from './dispatcher/tracking';
 import {debounce} from 'lodash';
 import {batch} from 'react-redux';
+import {
+  timeout,
+  ClientQuery,
+  ClientResponseType,
+  ClientErrorType,
+} from 'flipper-common';
 import {
   createState,
   _SandyPluginInstance,
   getFlipperLib,
-  timeout,
-  ClientQuery,
   _SandyPluginDefinition,
-  ClientResponseType,
-  ClientErrorType,
 } from 'flipper-plugin';
 import {freeze} from 'immer';
 import {message} from 'antd';

desktop/app/src/MenuBar.tsx

@@ -21,7 +21,7 @@ import {Store} from './reducers/';
 import electron, {MenuItemConstructorOptions} from 'electron';
 import {notNull} from './utils/typeUtils';
 import constants from './fb-stubs/constants';
-import {Logger} from './fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {
   NormalizedMenuEntry,
   _buildInMenuEntries,

desktop/app/src/NotificationsHub.tsx

@@ -8,7 +8,7 @@
  */
 
 import {SearchableProps} from './ui';
-import {Logger} from './fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {
   Searchable,
   Button,

desktop/app/src/PluginContainer.tsx

@@ -8,7 +8,7 @@
  */
 
 import {FlipperPlugin, FlipperDevicePlugin} from './plugin';
-import {Logger} from './fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import BaseDevice from './devices/BaseDevice';
 import {pluginKey as getPluginKey} from './utils/pluginKey';
 import Client from './Client';

desktop/app/src/__tests__/deeplink.node.tsx

@@ -20,7 +20,7 @@ import {
   useValue,
 } from 'flipper-plugin';
 import {handleDeeplink} from '../deeplink';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 
 test('Triggering a deeplink will work', async () => {
   const linksSeen: any[] = [];

desktop/app/src/chrome/ShareSheetExportFile.tsx

@@ -11,7 +11,7 @@ import {FlexColumn, Button, styled, Text, FlexRow, Spacer} from '../ui';
 import React, {Component} from 'react';
 import {reportPlatformFailures} from '../utils/metrics';
 import {performance} from 'perf_hooks';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {IdlerImpl} from '../utils/Idler';
 import {
   exportStoreToFile,

desktop/app/src/chrome/ShareSheetExportUrl.tsx

@@ -10,7 +10,7 @@
 import {FlexColumn, styled, Text, FlexRow, Spacer, Input} from '../ui';
 import React, {Component} from 'react';
 import {ReactReduxContext} from 'react-redux';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {IdlerImpl} from '../utils/Idler';
 import {
   shareFlipperData,

desktop/app/src/deeplink.tsx

@@ -8,7 +8,7 @@
  */
 
 import {Group, SUPPORTED_GROUPS} from './reducers/supportForm';
-import {Logger} from './fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {Store} from './reducers/index';
 import {importDataToStore} from './utils/exportData';
 import {selectPlugin, getAllClients} from './reducers/connections';

desktop/app/src/deeplinkTracking.tsx

@@ -7,7 +7,7 @@
  * @format
  */
 
-import {Logger} from './fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 
 export type OpenPluginParams = {
   pluginId: string;

desktop/app/src/devices/BaseDevice.tsx

@@ -9,19 +9,21 @@
 
 import stream from 'stream';
 import {
-  DeviceLogEntry,
+  Device,
   _SandyDevicePluginInstance,
   _SandyPluginDefinition,
-  DeviceType,
   DeviceLogListener,
   Idler,
   createState,
   getFlipperLib,
+} from 'flipper-plugin';
+import {
+  DeviceLogEntry,
   DeviceOS,
+  DeviceType,
   DeviceDescription,
   FlipperServer,
-  Device,
-} from 'flipper-plugin';
+} from 'flipper-common';
 import {DeviceSpec, PluginDetails} from 'flipper-plugin-lib';
 import {getPluginKey} from '../utils/pluginKey';
 import {Base64} from 'js-base64';

desktop/app/src/dispatcher/application.tsx

@@ -11,7 +11,7 @@
 // eslint-disable-next-line flipper/no-electron-remote-imports
 import {remote, ipcRenderer, IpcRendererEvent} from 'electron';
 import {Store} from '../reducers/index';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {parseFlipperPorts} from '../server/utils/environmentVariables';
 import {
   importFileToStore,

desktop/app/src/dispatcher/flipperServer.tsx

@@ -9,16 +9,16 @@
 
 import React from 'react';
 import {State, Store} from '../reducers/index';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {
   FlipperServerConfig,
   FlipperServerImpl,
 } from '../server/FlipperServerImpl';
 import {selectClient} from '../reducers/connections';
 import Client from '../Client';
-import {message, notification} from 'antd';
+import {notification} from 'antd';
 import BaseDevice from '../devices/BaseDevice';
-import {ClientDescription, timeout} from 'flipper-plugin';
+import {ClientDescription, timeout} from 'flipper-common';
 import {reportPlatformFailures} from '../utils/metrics';
 import {sideEffect} from '../utils/sideEffect';
 

desktop/app/src/dispatcher/index.tsx

@@ -23,7 +23,7 @@ import pluginDownloads from './pluginDownloads';
 import info from '../utils/info';
 import pluginChangeListener from './pluginsChangeListener';
 
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {Store} from '../reducers/index';
 import {Dispatcher} from './types';
 import {notNull} from '../utils/typeUtils';

desktop/app/src/dispatcher/notifications.tsx

@@ -8,7 +8,7 @@
  */
 
 import {Store} from '../reducers/index';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {PluginNotification} from '../reducers/notifications';
 import {ipcRenderer, IpcRendererEvent} from 'electron';
 import {

desktop/app/src/dispatcher/pluginManager.tsx

@@ -8,7 +8,7 @@
  */
 
 import type {Store} from '../reducers/index';
-import type {Logger} from '../fb-interfaces/Logger';
+import type {Logger} from 'flipper-common';
 import {
   LoadPluginActionPayload,
   UninstallPluginActionPayload,

desktop/app/src/dispatcher/plugins.tsx

@@ -8,7 +8,7 @@
  */
 
 import type {Store} from '../reducers/index';
-import type {Logger} from '../fb-interfaces/Logger';
+import type {Logger} from 'flipper-common';
 import {PluginDefinition} from '../plugin';
 import React from 'react';
 import ReactDOM from 'react-dom';

desktop/app/src/dispatcher/pluginsChangeListener.tsx

@@ -8,7 +8,7 @@
  */
 
 import Client from '../Client';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {Store} from '../reducers';
 import {appPluginListChanged} from '../reducers/connections';
 import {getActiveClient} from '../selectors/connections';

desktop/app/src/dispatcher/tracking.tsx

@@ -14,7 +14,7 @@ import {performance} from 'perf_hooks';
 import {EventEmitter} from 'events';
 
 import {State, Store} from '../reducers/index';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {
   getPluginBackgroundStats,
   resetPluginBackgroundStatsDelta,

desktop/app/src/dispatcher/types.tsx

@@ -8,7 +8,7 @@
  */
 
 import {Store} from '../reducers/index';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 
 export type Dispatcher = (
   store: Store,

desktop/app/src/fb-interfaces/Logger.tsx

@@ -1,14 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-export {LogTypes, TrackType, Logger} from 'flipper-plugin';
-
-export type Args = {
-  isTest?: boolean;
-};

desktop/app/src/fb-stubs/Logger.tsx

@@ -7,17 +7,17 @@
  * @format
  */
 
-import {Logger, Args} from '../fb-interfaces/Logger';
+import {Logger, LoggerArgs} from 'flipper-common';
 import StubLogger from '../utils/StubLogger';
 import {Store} from '../reducers/index';
 
 let instance: StubLogger | null = null;
 
-export function init(store: Store, _args?: Args): Logger {
+export function init(store: Store, _args?: LoggerArgs): Logger {
   if (instance) {
     throw new Error('Attempted to initialize Logger when already initialized');
   }
-  instance = new StubLogger(store);
+  instance = new StubLogger(store, _args);
   return instance;
 }
 

desktop/app/src/fb-stubs/__mocks__/Logger.tsx

@@ -12,7 +12,7 @@ import {
   getErrorFromErrorLike,
   getStringFromErrorLike,
 } from '../../utils/errors';
-import {Args, Logger} from '../../fb-interfaces/Logger';
+import {LoggerArgs, Logger} from 'flipper-common';
 
 const instance = {
   track: jest.fn(),
@@ -35,7 +35,7 @@ export function extractError(...data: Array<any>): {
   };
 }
 
-export function init(_store: Store, _args?: Args): Logger {
+export function init(_store: Store, _args?: LoggerArgs): Logger {
   return instance;
 }
 

desktop/app/src/index.tsx

@@ -123,7 +123,7 @@ export {default as FileSelector} from './ui/components/FileSelector';
 export {KeyboardActions} from './MenuBar';
 export {getFlipperMediaCDN, appendAccessTokenToUrl} from './fb-stubs/user';
 export {Rect} from './utils/geometry';
-export {Logger} from './fb-interfaces/Logger';
+export {Logger} from 'flipper-common';
 export {getInstance as getLogger} from './fb-stubs/Logger';
 export {callVSCode} from './utils/vscodeUtils';
 export {checkIdbIsInstalled} from './server/devices/ios/iOSContainerUtility';

desktop/app/src/plugin.tsx

@@ -8,7 +8,7 @@
  */
 
 import {KeyboardActions} from './MenuBar';
-import {Logger} from './fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import Client from './Client';
 import {Component} from 'react';
 import BaseDevice from './devices/BaseDevice';

desktop/app/src/reducers/connections.tsx

@@ -12,7 +12,7 @@ import {produce} from 'immer';
 
 import type BaseDevice from '../devices/BaseDevice';
 import type Client from '../Client';
-import type {UninitializedClient} from 'flipper-plugin';
+import type {UninitializedClient, DeviceOS, Logger} from 'flipper-common';
 import {performance} from 'perf_hooks';
 import type {Actions} from '.';
 import {WelcomeScreenStaticView} from '../sandy-chrome/WelcomeScreen';
@@ -21,7 +21,6 @@ import {getPluginKey} from '../utils/pluginKey';
 
 import {deconstructClientId} from '../utils/clientUtils';
 import type {RegisterPluginAction} from './plugins';
-import {DeviceOS, Logger} from 'flipper-plugin';
 import {FlipperServerImpl} from '../server/FlipperServerImpl';
 import {shallowEqual} from 'react-redux';
 

desktop/app/src/sandy-chrome/SandyApp.tsx

@@ -19,7 +19,7 @@ import {
 import {Link, styled} from '../ui';
 import {theme} from 'flipper-plugin';
 import {ipcRenderer} from 'electron';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 
 import {LeftRail} from './LeftRail';
 import {useStore, useDispatch} from '../utils/useStore';

desktop/app/src/server/FlipperServerImpl.tsx

@@ -8,7 +8,7 @@
  */
 
 import EventEmitter from 'events';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import ServerController from './comms/ServerController';
 import {CertificateExchangeMedium} from './utils/CertificateProvider';
 import {ServerPorts} from '../reducers/application';
@@ -22,7 +22,7 @@ import {
   FlipperServerCommands,
   FlipperServer,
   UninitializedClient,
-} from 'flipper-plugin';
+} from 'flipper-common';
 import {ServerDevice} from './devices/ServerDevice';
 import {Base64} from 'js-base64';
 import MetroDevice from './devices/metro/MetroDevice';

desktop/app/src/server/comms/BrowserClientFlipperConnection.tsx

@@ -7,7 +7,7 @@
  * @format
  */
 
-import {ClientResponseType} from 'flipper-plugin';
+import {ClientResponseType} from 'flipper-common';
 import WebSocket from 'ws';
 import {
   ConnectionStatusChange,

desktop/app/src/server/comms/ClientConnection.tsx

@@ -7,7 +7,7 @@
  * @format
  */
 
-import {ClientResponseType} from 'flipper-plugin';
+import {ClientResponseType} from 'flipper-common';
 
 export enum ConnectionStatus {
   ERROR = 'error',

desktop/app/src/server/comms/ServerAdapter.tsx

@@ -13,7 +13,7 @@ import {
 } from '../utils/CertificateProvider';
 import {ClientConnection} from './ClientConnection';
 import {transformCertificateExchangeMediumToType} from './Utilities';
-import {ClientDescription, ClientQuery} from 'flipper-plugin';
+import {ClientDescription, ClientQuery} from 'flipper-common';
 
 /**
  * ClientCsrQuery defines a client query with CSR

desktop/app/src/server/comms/ServerController.tsx

@@ -8,11 +8,11 @@
  */
 
 import {CertificateExchangeMedium} from '../utils/CertificateProvider';
-import {Logger} from '../../fb-interfaces/Logger';
-import {ClientDescription, ClientQuery} from 'flipper-plugin';
+import {Logger} from 'flipper-common';
+import {ClientDescription, ClientQuery} from 'flipper-common';
 import CertificateProvider from '../utils/CertificateProvider';
 import {ClientConnection, ConnectionStatus} from './ClientConnection';
-import {UninitializedClient} from 'flipper-plugin';
+import {UninitializedClient} from 'flipper-common';
 import {reportPlatformFailures} from '../../utils/metrics';
 import {EventEmitter} from 'events';
 import invariant from 'invariant';

desktop/app/src/server/comms/ServerRSocket.tsx

@@ -27,7 +27,7 @@ import {
   ClientDescription,
   ClientQuery,
   ClientResponseType,
-} from 'flipper-plugin';
+} from 'flipper-common';
 
 /**
  * RSocket based server. RSocket uses its own protocol for communication between

desktop/app/src/server/comms/ServerWebSocket.tsx

@@ -23,7 +23,7 @@ import {
   ClientErrorType,
   ClientQuery,
   DeviceOS,
-} from 'flipper-plugin';
+} from 'flipper-common';
 
 /**
  * WebSocket-based server.

desktop/app/src/server/comms/ServerWebSocketBrowser.tsx

@@ -15,7 +15,7 @@ import {ServerEventsListener} from './ServerAdapter';
 import constants from '../../fb-stubs/constants';
 import ws from 'ws';
 import {IncomingMessage} from 'http';
-import {ClientDescription, ClientQuery} from 'flipper-plugin';
+import {ClientDescription, ClientQuery} from 'flipper-common';
 
 /**
  * WebSocket-based server which uses a connect/disconnect handshake over an insecure channel.

desktop/app/src/server/comms/Utilities.tsx

@@ -7,7 +7,7 @@
  * @format
  */
 
-import {ClientQuery} from 'flipper-plugin';
+import {ClientQuery} from 'flipper-common';
 import {CertificateExchangeMedium} from '../utils/CertificateProvider';
 
 /**

desktop/app/src/server/devices/DummyDevice.tsx

@@ -7,7 +7,7 @@
  * @format
  */
 
-import {DeviceOS} from 'flipper-plugin';
+import {DeviceOS} from 'flipper-common';
 import {FlipperServerImpl} from '../FlipperServerImpl';
 import {ServerDevice} from './ServerDevice';
 

desktop/app/src/server/devices/ServerDevice.tsx

@@ -7,13 +7,13 @@
  * @format
  */
 
-import {createState, DeviceDescription, DeviceLogEntry} from 'flipper-plugin';
+import {DeviceDescription, DeviceLogEntry} from 'flipper-common';
 import {FlipperServerImpl} from '../FlipperServerImpl';
 
 export abstract class ServerDevice {
   readonly info: DeviceDescription;
-  readonly connected = createState(true);
   readonly flipperServer: FlipperServerImpl;
+  connected = true;
 
   constructor(flipperServer: FlipperServerImpl, info: DeviceDescription) {
     this.flipperServer = flipperServer;
@@ -34,7 +34,9 @@ export abstract class ServerDevice {
   /**
    * The device might have no active connection
    */
-  disconnect(): void {}
+  disconnect(): void {
+    this.connected = false;
+  }
 
   startLogging() {
     // to be subclassed

desktop/app/src/server/devices/android/AndroidDevice.tsx

@@ -10,7 +10,7 @@
 import adb, {Client as ADBClient, PullTransfer} from 'adbkit';
 import {Priority, Reader} from 'adbkit-logcat';
 import {createWriteStream} from 'fs';
-import type {LogLevel, DeviceType} from 'flipper-plugin';
+import type {DeviceLogLevel, DeviceType} from 'flipper-common';
 import which from 'which';
 import {spawn} from 'child_process';
 import {dirname, join} from 'path';
@@ -56,7 +56,7 @@ export default class AndroidDevice extends ServerDevice {
         this.reader = reader;
         reader
           .on('entry', (entry) => {
-            let type: LogLevel = 'unknown';
+            let type: DeviceLogLevel = 'unknown';
             if (entry.priority === Priority.VERBOSE) {
               type = 'verbose';
             }
@@ -89,7 +89,7 @@ export default class AndroidDevice extends ServerDevice {
             if (this.reader) {
               // logs didn't stop gracefully
               setTimeout(() => {
-                if (this.connected.get()) {
+                if (this.connected) {
                   console.warn(
                     `Log stream broken: ${this.serial} - restarting`,
                   );

desktop/app/src/server/devices/ios/IOSDevice.tsx

@@ -7,7 +7,12 @@
  * @format
  */
 
-import {LogLevel, DeviceLogEntry, DeviceType, timeout} from 'flipper-plugin';
+import {
+  DeviceLogLevel,
+  DeviceLogEntry,
+  DeviceType,
+  timeout,
+} from 'flipper-common';
 import child_process, {ChildProcess} from 'child_process';
 import JSONStream from 'JSONStream';
 import {Transform} from 'stream';
@@ -65,7 +70,7 @@ export default class IOSDevice extends ServerDevice {
   }
 
   async screenshot(): Promise<Buffer> {
-    if (!this.connected.get()) {
+    if (!this.connected) {
       return Buffer.from([]);
     }
     return await this.iOSBridge.screenshot(this.serial);
@@ -148,7 +153,7 @@ export default class IOSDevice extends ServerDevice {
     }
   }
 
-  static getLogLevel(level: string): LogLevel {
+  static getLogLevel(level: string): DeviceLogLevel {
     switch (level) {
       case 'Default':
         return 'debug';
@@ -183,7 +188,7 @@ export default class IOSDevice extends ServerDevice {
   }
 
   static parseJsonLogEntry(entry: RawLogEntry): DeviceLogEntry {
-    let type: LogLevel = IOSDevice.getLogLevel(entry.messageType);
+    let type: DeviceLogLevel = IOSDevice.getLogLevel(entry.messageType);
 
     // when Apple log levels are not used, log messages can be prefixed with
     // their loglevel.
@@ -215,7 +220,7 @@ export default class IOSDevice extends ServerDevice {
   }
 
   async screenCaptureAvailable() {
-    return this.info.deviceType === 'emulator' && this.connected.get();
+    return this.info.deviceType === 'emulator' && this.connected;
   }
 
   async startScreenCapture(destination: string) {

desktop/app/src/server/devices/ios/iOSDeviceManager.tsx

@@ -8,7 +8,7 @@
  */
 
 import {ChildProcess} from 'child_process';
-import type {DeviceType} from 'flipper-plugin';
+import type {DeviceType} from 'flipper-common';
 import path from 'path';
 import childProcess from 'child_process';
 import {exec, execFile} from 'promisify-child-process';

desktop/app/src/server/devices/metro/MetroDevice.tsx

@@ -7,7 +7,7 @@
  * @format
  */
 
-import {LogLevel} from 'flipper-plugin';
+import {DeviceLogLevel} from 'flipper-common';
 import util from 'util';
 import {FlipperServerImpl} from '../../FlipperServerImpl';
 import {ServerDevice} from '../ServerDevice';
@@ -102,7 +102,7 @@ export type MetroReportableEvent =
       data: Array<any>;
     };
 
-const metroLogLevelMapping: {[key: string]: LogLevel} = {
+const metroLogLevelMapping: {[key: string]: DeviceLogLevel} = {
   trace: 'verbose',
   info: 'info',
   warn: 'warn',
@@ -116,7 +116,7 @@ const metroLogLevelMapping: {[key: string]: LogLevel} = {
 
 function getLoglevelFromMessageType(
   type: MetroReportableEvent['type'],
-): LogLevel | null {
+): DeviceLogLevel | null {
   switch (type) {
     case 'bundle_build_done':
     case 'bundle_build_started':
@@ -163,7 +163,8 @@ export default class MetroDevice extends ServerDevice {
   private _handleWSMessage = ({data}: any) => {
     const message: MetroReportableEvent = JSON.parse(data);
     if (message.type === 'client_log') {
-      const type: LogLevel = metroLogLevelMapping[message.level] || 'unknown';
+      const type: DeviceLogLevel =
+        metroLogLevelMapping[message.level] || 'unknown';
       this.addLogEntry({
         date: new Date(),
         pid: 0,

desktop/app/src/server/utils/CertificateProvider.tsx

@@ -7,7 +7,7 @@
  * @format
  */
 
-import {Logger} from '../../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {internGraphPOSTAPIRequest} from '../../fb-stubs/user';
 import ServerController from '../comms/ServerController';
 import {promisify} from 'util';
@@ -26,7 +26,7 @@ import * as androidUtil from '../devices/android/androidContainerUtility';
 import os from 'os';
 import {Client as ADBClient} from 'adbkit';
 import archiver from 'archiver';
-import {timeout} from 'flipper-plugin';
+import {timeout} from 'flipper-common';
 import {v4 as uuid} from 'uuid';
 import {isTest} from '../../utils/isProduction';
 import {message} from 'antd';

desktop/app/src/test-utils/MockFlipper.tsx

@@ -17,7 +17,7 @@ import {
   ConnectionStatusChange,
 } from '../server/comms/ClientConnection';
 import {buildClientId} from '../utils/clientUtils';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import {PluginDefinition} from '../plugin';
 import {registerPlugins} from '../reducers/plugins';
 import {getInstance} from '../fb-stubs/Logger';
@@ -25,7 +25,7 @@ import {initializeFlipperLibImplementation} from '../utils/flipperLibImplementat
 import pluginManager from '../dispatcher/pluginManager';
 import {PluginDetails} from 'flipper-plugin-lib';
 import ArchivedDevice from '../devices/ArchivedDevice';
-import {ClientQuery, DeviceOS} from 'flipper-plugin';
+import {ClientQuery, DeviceOS} from 'flipper-common';
 import {TestDevice} from './TestDevice';
 
 export interface AppOptions {

desktop/app/src/test-utils/createMockFlipperWithPlugin.tsx

@@ -26,7 +26,7 @@ import BaseDevice from '../devices/BaseDevice';
 import {Store} from '../reducers/index';
 import Client from '../Client';
 
-import {Logger} from '../fb-interfaces/Logger';
+import {ClientQuery, Logger} from 'flipper-common';
 import {FlipperDevicePlugin, FlipperPlugin, PluginDefinition} from '../plugin';
 import PluginContainer from '../PluginContainer';
 import {isDevicePluginDefinition} from '../utils/pluginUtils';
@@ -36,7 +36,7 @@ import MockFlipper from './MockFlipper';
 import {switchPlugin} from '../reducers/pluginManager';
 import {createSandyPluginFromClassicPlugin} from '../dispatcher/plugins';
 import {createMockActivatablePluginDetails} from '../utils/testUtils';
-import {ClientQuery, _SandyPluginDefinition} from 'flipper-plugin';
+import {_SandyPluginDefinition} from 'flipper-plugin';
 
 export type MockFlipperResult = {
   client: Client;

desktop/app/src/ui/components/elements-inspector/sidebar.tsx

@@ -10,7 +10,7 @@
 import {ElementsInspectorElement} from 'flipper-plugin';
 import {PluginClient} from '../../../plugin';
 import Client from '../../../Client';
-import {Logger} from '../../../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 import Panel from '../Panel';
 import {DataInspector} from 'flipper-plugin';
 import {Component} from 'react';

desktop/app/src/utils/StubLogger.tsx

@@ -7,13 +7,18 @@
  * @format
  */
 
-import {Logger, Args, TrackType} from '../fb-interfaces/Logger';
+import {Logger, LoggerTrackType, LoggerArgs} from 'flipper-common';
 import {Store} from '../reducers/index';
 
 export default class StubLogger implements Logger {
-  constructor(_store: Store, _args?: Args) {}
+  constructor(_store: Store, _args?: LoggerArgs) {}
 
-  track(_type: TrackType, _event: string, _data?: any, _plugin?: string) {}
+  track(
+    _type: LoggerTrackType,
+    _event: string,
+    _data?: any,
+    _plugin?: string,
+  ) {}
 
   trackTimeSince(_mark: string, _eventName?: string) {}
 

desktop/app/src/utils/exportData.tsx

@@ -40,7 +40,8 @@ import {processMessageQueue} from './messageQueue';
 import {getPluginTitle} from './pluginUtils';
 import {capture} from './screenshot';
 import {uploadFlipperMedia} from '../fb-stubs/user';
-import {ClientQuery, Dialog, Idler} from 'flipper-plugin';
+import {Dialog, Idler} from 'flipper-plugin';
+import {ClientQuery} from 'flipper-common';
 import ShareSheetExportUrl from '../chrome/ShareSheetExportUrl';
 import ShareSheetExportFile from '../chrome/ShareSheetExportFile';
 import ExportDataPluginSheet from '../chrome/ExportDataPluginSheet';

desktop/app/src/utils/flipperLibImplementation.tsx

@@ -8,7 +8,7 @@
  */
 
 import {_setFlipperLibImplementation} from 'flipper-plugin';
-import type {Logger} from '../fb-interfaces/Logger';
+import type {Logger} from 'flipper-common';
 import type {Store} from '../reducers';
 import createPaste from '../fb-stubs/createPaste';
 import GK from '../fb-stubs/GK';

desktop/app/src/utils/info.tsx

@@ -14,7 +14,7 @@ import {getStaticPath} from './pathUtils';
 import type {State, Store} from '../reducers/index';
 import {deconstructClientId} from './clientUtils';
 import {sideEffect} from './sideEffect';
-import {Logger} from '../fb-interfaces/Logger';
+import {Logger} from 'flipper-common';
 
 type PlatformInfo = {
   arch: string;