From f26a28f6f6d31abf6ee67d79dc9e7dee928597c0 Mon Sep 17 00:00:00 2001
From: Pritesh Nandgaonkar <prit91@fb.com>
Date: Fri, 9 Aug 2019 06:50:45 -0700
Subject: [PATCH] Migrate ArchivedDevice from js to tsx

Summary: As per the title

Reviewed By: passy

Differential Revision: D16667144

fbshipit-source-id: 9fe923f8389feafa66d6bf6967217ce89ddbfaf2
---
 src/devices/AndroidDevice.js                         |  2 +-
 .../{ArchivedDevice.js => ArchivedDevice.tsx}        | 12 ++++--------
 src/index.js                                         |  2 +-
 src/utils/__tests__/exportData.electron.js           |  2 +-
 src/utils/exportData.js                              |  2 +-
 5 files changed, 8 insertions(+), 12 deletions(-)
 rename src/devices/{ArchivedDevice.js => ArchivedDevice.tsx} (81%)

diff --git a/src/devices/AndroidDevice.js b/src/devices/AndroidDevice.js
index c562fe32c..90ae67a19 100644
--- a/src/devices/AndroidDevice.js
+++ b/src/devices/AndroidDevice.js
@@ -10,7 +10,7 @@ import BaseDevice from './BaseDevice.tsx';
 import {Priority} from 'adbkit-logcat-fb';
 import child_process from 'child_process';
 import child_process_promise from 'child-process-es6-promise';
-import ArchivedDevice from './ArchivedDevice.js';
+import ArchivedDevice from './ArchivedDevice.tsx';
 
 type ADBClient = any;
 
diff --git a/src/devices/ArchivedDevice.js b/src/devices/ArchivedDevice.tsx
similarity index 81%
rename from src/devices/ArchivedDevice.js
rename to src/devices/ArchivedDevice.tsx
index 44d6798a9..b8294707a 100644
--- a/src/devices/ArchivedDevice.js
+++ b/src/devices/ArchivedDevice.tsx
@@ -4,15 +4,11 @@
  * LICENSE file in the root directory of this source tree.
  * @format
  */
-import BaseDevice from './BaseDevice.tsx';
-import type {
-  DeviceType,
-  OS,
-  DeviceShell,
-  DeviceLogEntry,
-} from './BaseDevice.tsx';
+import BaseDevice from './BaseDevice';
+import {DeviceType, OS, DeviceShell, DeviceLogEntry} from './BaseDevice';
 
 export default class ArchivedDevice extends BaseDevice {
+  // @ts-ignore: Super needs to be on the first line
   constructor(
     serial: string,
     deviceType: DeviceType,
@@ -44,7 +40,7 @@ export default class ArchivedDevice extends BaseDevice {
     return Promise.resolve();
   }
 
-  spawnShell(): ?DeviceShell {
+  spawnShell(): DeviceShell | undefined | null {
     return null;
   }
 }
diff --git a/src/index.js b/src/index.js
index 1c88cbf64..ef16ed13d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -42,7 +42,7 @@ export {createTablePlugin} from './createTablePlugin.js';
 export {default as DetailSidebar} from './chrome/DetailSidebar.js';
 
 export {default as AndroidDevice} from './devices/AndroidDevice.js';
-export {default as ArchivedDevice} from './devices/ArchivedDevice.js';
 export {default as Device} from './devices/BaseDevice.tsx';
+export {default as ArchivedDevice} from './devices/ArchivedDevice.tsx';
 export {default as IOSDevice} from './devices/IOSDevice.js';
 export type {OS} from './devices/BaseDevice.tsx';
diff --git a/src/utils/__tests__/exportData.electron.js b/src/utils/__tests__/exportData.electron.js
index ff75a63eb..e86acb422 100644
--- a/src/utils/__tests__/exportData.electron.js
+++ b/src/utils/__tests__/exportData.electron.js
@@ -6,7 +6,7 @@
  */
 
 import {default as BaseDevice} from '../../devices/BaseDevice.tsx';
-import {default as ArchivedDevice} from '../../devices/ArchivedDevice';
+import {default as ArchivedDevice} from '../../devices/ArchivedDevice.tsx';
 import {processStore} from '../exportData';
 import {FlipperDevicePlugin} from '../../plugin.tsx';
 import type {Notification} from '../../plugin.tsx';
diff --git a/src/utils/exportData.js b/src/utils/exportData.js
index 5310053d4..c541969c2 100644
--- a/src/utils/exportData.js
+++ b/src/utils/exportData.js
@@ -14,8 +14,8 @@ import type {State as PluginStatesState} from '../reducers/pluginStates.tsx';
 import {pluginKey} from '../reducers/pluginStates.tsx';
 import {FlipperDevicePlugin, FlipperPlugin, callClient} from '../plugin.tsx';
 import {default as BaseDevice} from '../devices/BaseDevice.tsx';
-import {default as ArchivedDevice} from '../devices/ArchivedDevice';
 import {default as Client} from '../Client.tsx';
+import {default as ArchivedDevice} from '../devices/ArchivedDevice.tsx';
 import fs from 'fs';
 import uuid from 'uuid';
 import {remote} from 'electron';