From dcaff4babc32a2109d3b8f18119fd94223e00a56 Mon Sep 17 00:00:00 2001
From: Pritesh Nandgaonkar <prit91@fb.com>
Date: Wed, 13 May 2020 06:55:10 -0700
Subject: [PATCH] @allow-large-files Upgrade typescript

Summary: This diff updates the typescript version and it fixes `yarn lint:tsc`. It also successfully pointed out fes of the problems in our codebase. I have fixed those problems

Reviewed By: mweststrate

Differential Revision: D21548003

fbshipit-source-id: e69c986ee3c763588d9e1e290dad08d1cf1976a8
---
 desktop/app/src/store.tsx                                    | 1 +
 .../app/src/ui/components/elements-inspector/Visualizer.tsx  | 1 -
 desktop/app/src/ui/components/searchable/FilterToken.tsx     | 2 +-
 desktop/package.json                                         | 2 +-
 desktop/plugins/fresco/index.tsx                             | 2 +-
 desktop/tsconfig.json                                        | 4 +++-
 desktop/yarn.lock                                            | 5 +++++
 7 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/desktop/app/src/store.tsx b/desktop/app/src/store.tsx
index e167d40af..f6186360a 100644
--- a/desktop/app/src/store.tsx
+++ b/desktop/app/src/store.tsx
@@ -14,6 +14,7 @@ import isProduction from './utils/isProduction';
 
 export const store = createStore<StoreState, Actions, any, any>(
   reducers,
+  // @ts-ignore Type definition mismatch
   window.__REDUX_DEVTOOLS_EXTENSION__
     ? window.__REDUX_DEVTOOLS_EXTENSION__({
         // @ts-ignore: stateSanitizer is not part of type definition.
diff --git a/desktop/app/src/ui/components/elements-inspector/Visualizer.tsx b/desktop/app/src/ui/components/elements-inspector/Visualizer.tsx
index b8d0088d1..e09de6dc0 100644
--- a/desktop/app/src/ui/components/elements-inspector/Visualizer.tsx
+++ b/desktop/app/src/ui/components/elements-inspector/Visualizer.tsx
@@ -111,7 +111,6 @@ function Visualizer(props: {
             userSelect: 'none',
           }}></div>
       )}
-      />
     </VisualizerContainer>
   );
 }
diff --git a/desktop/app/src/ui/components/searchable/FilterToken.tsx b/desktop/app/src/ui/components/searchable/FilterToken.tsx
index 75b934913..79155a039 100644
--- a/desktop/app/src/ui/components/searchable/FilterToken.tsx
+++ b/desktop/app/src/ui/components/searchable/FilterToken.tsx
@@ -194,8 +194,8 @@ export default class FilterToken extends PureComponent<Props> {
         value = [];
       }
       const newFilter: Filter = {
-        type: 'enum',
         ...filter,
+        type: 'enum',
         value,
       };
       this.props.onReplace(index, newFilter);
diff --git a/desktop/package.json b/desktop/package.json
index 9fa53ae9b..41f7b0d04 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -204,7 +204,7 @@
     "tmp": "^0.2.1",
     "ts-jest": "^25.4.0",
     "ts-node": "^8.8.1",
-    "typescript": "^3.7.2",
+    "typescript": "^3.9.2",
     "yargs": "^15.3.1",
     "yazl": "^2.5.1"
   },
diff --git a/desktop/plugins/fresco/index.tsx b/desktop/plugins/fresco/index.tsx
index 2cb2977c0..ba1a36107 100644
--- a/desktop/plugins/fresco/index.tsx
+++ b/desktop/plugins/fresco/index.tsx
@@ -141,7 +141,7 @@ export default class FlipperImagesPlugin extends FlipperPlugin<
         }
         pluginData = {
           ...pluginData,
-          events: [{eventId: index, ...event}, ...pluginData.events],
+          events: [{...event, eventId: index}, ...pluginData.events],
         };
       });
       const idSet: Set<string> = levels.reduce((acc, level: CacheInfo) => {
diff --git a/desktop/tsconfig.json b/desktop/tsconfig.json
index eea1056f4..0cc1644ed 100644
--- a/desktop/tsconfig.json
+++ b/desktop/tsconfig.json
@@ -2,6 +2,8 @@
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "baseUrl": ".",
+    "skipLibCheck": true,
+    "noEmit": true,
     "paths": {
       "flipper": ["./app/src"],
       "flipper-doctor": ["./doctor/src"],
@@ -11,5 +13,5 @@
       "flipper-babel-transformer": ["./babel-transformer/src"]
     }
   },
-  "exclude": ["node_modules", "**/*.spec.ts"]
+  "exclude": ["**/node_modules/", "**/*.spec.ts"]
 }
diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index 573b8dc13..f5edcb1ab 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -12705,6 +12705,11 @@ typescript@^3.7.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"
   integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==
 
+typescript@^3.9.2:
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.2.tgz#64e9c8e9be6ea583c54607677dd4680a1cf35db9"
+  integrity sha512-q2ktq4n/uLuNNShyayit+DTobV2ApPEo/6so68JaD5ojvc/6GClBipedB9zNWYxRSAlZXAe405Rlijzl6qDiSw==
+
 ua-parser-js@^0.7.18:
   version "0.7.20"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"