From f408f3f949018b06eedf0c7c0a9d585d49cf2089 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Fri, 9 Aug 2019 07:47:34 -0700 Subject: [PATCH] Migrate the iOSDevice from js to tsx Summary: As per the title. Reviewed By: jknoxville Differential Revision: D16668086 fbshipit-source-id: c246fcaf117802cf1d3c6b3959bf0d0c2761fdce --- src/chrome/ScreenCaptureButtons.js | 2 +- src/devices/{IOSDevice.js => IOSDevice.tsx} | 42 ++++++++++----------- src/dispatcher/iOSDevice.js | 2 +- src/index.js | 2 +- 4 files changed, 23 insertions(+), 25 deletions(-) rename src/devices/{IOSDevice.js => IOSDevice.tsx} (88%) diff --git a/src/chrome/ScreenCaptureButtons.js b/src/chrome/ScreenCaptureButtons.js index ade9c71e9..ae4723f76 100644 --- a/src/chrome/ScreenCaptureButtons.js +++ b/src/chrome/ScreenCaptureButtons.js @@ -8,7 +8,7 @@ import {Button, ButtonGroup, Component} from 'flipper'; import {connect} from 'react-redux'; import AndroidDevice from '../devices/AndroidDevice.tsx'; -import IOSDevice from '../devices/IOSDevice'; +import IOSDevice from '../devices/IOSDevice.tsx'; import expandTilde from 'expand-tilde'; import fs from 'fs'; import os from 'os'; diff --git a/src/devices/IOSDevice.js b/src/devices/IOSDevice.tsx similarity index 88% rename from src/devices/IOSDevice.js rename to src/devices/IOSDevice.tsx index 34f21379c..74feec242 100644 --- a/src/devices/IOSDevice.js +++ b/src/devices/IOSDevice.tsx @@ -5,41 +5,39 @@ * @format */ -import type {DeviceType, LogLevel, DeviceLogEntry} from './BaseDevice.tsx'; +import {DeviceType, LogLevel, DeviceLogEntry} from './BaseDevice'; import child_process from 'child_process'; -import BaseDevice from './BaseDevice.tsx'; +import BaseDevice from './BaseDevice'; import JSONStream from 'JSONStream'; import {Transform} from 'stream'; type IOSLogLevel = 'Default' | 'Info' | 'Debug' | 'Error' | 'Fault'; -type RawLogEntry = {| - eventMessage: string, - machTimestamp: number, - messageType: IOSLogLevel, - processID: number, - processImagePath: string, - processImageUUID: string, - processUniqueID: number, - senderImagePath: string, - senderImageUUID: string, - senderProgramCounter: number, - threadID: number, - timestamp: string, - timezoneName: string, - traceID: string, -|}; +type RawLogEntry = { + eventMessage: string; + machTimestamp: number; + messageType: IOSLogLevel; + processID: number; + processImagePath: string; + processImageUUID: string; + processUniqueID: number; + senderImagePath: string; + senderImageUUID: string; + senderProgramCounter: number; + threadID: number; + timestamp: string; + timezoneName: string; + traceID: string; +}; export default class IOSDevice extends BaseDevice { - icon = 'icons/ios.svg'; - os = 'iOS'; - log: any; buffer: string; constructor(serial: string, deviceType: DeviceType, title: string) { super(serial, deviceType, title); - + this.icon = 'icons/ios.svg'; + this.os = 'iOS'; this.buffer = ''; this.log = this.startLogListener(); } diff --git a/src/dispatcher/iOSDevice.js b/src/dispatcher/iOSDevice.js index b22a44b5f..b4460e2db 100644 --- a/src/dispatcher/iOSDevice.js +++ b/src/dispatcher/iOSDevice.js @@ -13,8 +13,8 @@ import {promisify} from 'util'; import path from 'path'; import child_process from 'child_process'; const execFile = child_process.execFile; -import IOSDevice from '../devices/IOSDevice'; import iosUtil from '../fb-stubs/iOSContainerUtility.tsx'; +import IOSDevice from '../devices/IOSDevice.tsx'; import isProduction from '../utils/isProduction.js'; import GK from '../fb-stubs/GK.tsx'; import {registerDeviceCallbackOnPlugins} from '../utils/onRegisterDevice.js'; diff --git a/src/index.js b/src/index.js index d05b4cc17..b58936f68 100644 --- a/src/index.js +++ b/src/index.js @@ -44,5 +44,5 @@ export {default as DetailSidebar} from './chrome/DetailSidebar.js'; export {default as Device} from './devices/BaseDevice.tsx'; export {default as AndroidDevice} from './devices/AndroidDevice.tsx'; export {default as ArchivedDevice} from './devices/ArchivedDevice.tsx'; -export {default as IOSDevice} from './devices/IOSDevice.js'; +export {default as IOSDevice} from './devices/IOSDevice.tsx'; export type {OS} from './devices/BaseDevice.tsx';