From 4afc417ea544ef8a56ad6849c9eda292fe76bfc4 Mon Sep 17 00:00:00 2001 From: John Knox Date: Fri, 9 Aug 2019 08:58:19 -0700 Subject: [PATCH] Convert iOSDevice dispatcher to TS Summary: Convert iOSDevice dispatcher to TS Reviewed By: passy Differential Revision: D16690183 fbshipit-source-id: 629ac178e91b4774449503529df7e07cee6741c5 --- .../{iOSDevice.js => iOSDevice.tsx} | 37 ++++++++++--------- src/utils/listDevices.js | 2 +- 2 files changed, 20 insertions(+), 19 deletions(-) rename src/dispatcher/{iOSDevice.js => iOSDevice.tsx} (90%) diff --git a/src/dispatcher/iOSDevice.js b/src/dispatcher/iOSDevice.tsx similarity index 90% rename from src/dispatcher/iOSDevice.js rename to src/dispatcher/iOSDevice.tsx index b4460e2db..8b8918802 100644 --- a/src/dispatcher/iOSDevice.js +++ b/src/dispatcher/iOSDevice.tsx @@ -5,28 +5,28 @@ * @format */ -import type {ChildProcess} from 'child_process'; -import type {Store} from '../reducers/index.tsx'; -import type {Logger} from '../fb-interfaces/Logger.js'; -import type {DeviceType} from '../devices/BaseDevice.tsx'; +import {ChildProcess} from 'child_process'; +import {Store} from '../reducers/index'; +import {Logger} from '../fb-interfaces/Logger.js'; +import {DeviceType} from '../devices/BaseDevice'; import {promisify} from 'util'; import path from 'path'; import child_process from 'child_process'; const execFile = child_process.execFile; -import iosUtil from '../fb-stubs/iOSContainerUtility.tsx'; -import IOSDevice from '../devices/IOSDevice.tsx'; +import iosUtil from '../fb-stubs/iOSContainerUtility'; +import IOSDevice from '../devices/IOSDevice'; import isProduction from '../utils/isProduction.js'; -import GK from '../fb-stubs/GK.tsx'; +import GK from '../fb-stubs/GK'; import {registerDeviceCallbackOnPlugins} from '../utils/onRegisterDevice.js'; -type iOSSimulatorDevice = {| - state: 'Booted' | 'Shutdown' | 'Shutting Down', - availability?: string, - isAvailable?: 'YES' | 'NO' | true | false, - name: string, - udid: string, -|}; +type iOSSimulatorDevice = { + state: 'Booted' | 'Shutdown' | 'Shutting Down'; + availability?: string; + isAvailable?: 'YES' | 'NO' | true | false; + name: string; + udid: string; +}; -type IOSDeviceParams = {udid: string, type: DeviceType, name: string}; +type IOSDeviceParams = {udid: string; type: DeviceType; name: string}; function isAvailable(simulator: iOSSimulatorDevice): boolean { // For some users "availability" is set, for others it's "isAvailable" @@ -123,9 +123,10 @@ function getActiveSimulators(): Promise> { ) .then(({stdout}) => JSON.parse(stdout).devices) .then(simulatorDevices => { + // @ts-ignore const simulators: Array = Object.values( simulatorDevices, - // $FlowFixMe + // @ts-ignore ).reduce((acc, cv) => acc.concat(cv), []); return simulators @@ -137,7 +138,7 @@ function getActiveSimulators(): Promise> { udid: simulator.udid, type: 'emulator', name: simulator.name, - }; + } as IOSDeviceParams; }); }) .catch(_ => []); @@ -179,7 +180,7 @@ async function checkXcodeVersionMismatch() { } export async function getActiveDevicesAndSimulators(): Promise< - Array, + Array > { const activeDevices: Array> = await Promise.all([ getActiveSimulators(), diff --git a/src/utils/listDevices.js b/src/utils/listDevices.js index 77823001b..c8c748158 100644 --- a/src/utils/listDevices.js +++ b/src/utils/listDevices.js @@ -5,7 +5,7 @@ * @format */ import {getActiveAndroidDevices} from '../dispatcher/androidDevice.tsx'; -import {getActiveDevicesAndSimulators} from '../dispatcher/iOSDevice'; +import {getActiveDevicesAndSimulators} from '../dispatcher/iOSDevice.tsx'; import type BaseDevice from '../devices/BaseDevice.tsx'; export async function listDevices(): Promise> {