Merge pull request #5663 from artsy/bump-typescript

[Lib] Bump typescript to latest
artsy · May 28, 2020 · 9f5dbdc · 9f5dbdc
2 parents 2903b4a + afb510e
commit 9f5dbdc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -226,7 +226,7 @@
     "tti-polyfill": "0.2.2",
     "twilio": "2.11.1",
     "typeahead.js": "0.10.5",
-    "typescript": "3.8.3",
+    "typescript": "^3.9.3",
     "ua-parser-js": "0.7.19",
     "underscore": "1.8.3",
     "underscore.string": "3.3.5",

diff --git a/src/desktop/apps/consign/client/__tests__/reducers.jest.ts b/src/desktop/apps/consign/client/__tests__/reducers.jest.ts
@@ -29,12 +29,12 @@ describe("Reducers", () => {
   describe("actions", () => {
     describe("setup", () => {
       it("returns the initial state", () => {
-        const { submissionFlow } = reducers(undefined, {})
+        const { submissionFlow } = reducers(undefined, {} as any)
         submissionFlow.currentStep.should.eql("createAccount")
       })
 
       it("passes URL queryParams into state", () => {
-        const initialState = reducers(undefined, {})
+        const initialState = reducers(undefined, {} as any)
         expect(initialState.submissionFlow.contextPath).toEqual("foo")
         expect(initialState.submissionFlow.subject).toEqual("bar")
       })
@@ -44,7 +44,7 @@ describe("Reducers", () => {
       let initialResponse
 
       beforeEach(() => {
-        initialResponse = reducers(undefined, {})
+        initialResponse = reducers(undefined, {} as any)
       })
 
       describe("#updateSubmission", () => {
@@ -293,7 +293,7 @@ describe("Reducers", () => {
           )
           const scrubbedLocation = reducers(
             updatedAutocomplete,
-            actions.scrubLocation()
+            actions.scrubLocation() as any
           )
           scrubbedLocation.submissionFlow.inputs.location_city.should.eql("")
           scrubbedLocation.submissionFlow.inputs.location_state.should.eql("")
@@ -324,7 +324,7 @@ describe("Reducers", () => {
           )
           const scrubbedLocation = reducers(
             updatedAutocomplete,
-            actions.scrubLocation()
+            actions.scrubLocation() as any
           )
           scrubbedLocation.submissionFlow.inputs.location_city.should.eql("")
           scrubbedLocation.submissionFlow.inputs.location_state.should.eql(

diff --git a/src/v2/Apps/Conversation/Routes/Conversation/index.tsx b/src/v2/Apps/Conversation/Routes/Conversation/index.tsx
@@ -23,6 +23,10 @@ interface ConversationRouteProps {
   match: Match
 }
 
+/**
+ * FIXME: Added some @ts-ignores to get TypeScript 3.9 updated
+ */
+
 export const ConversationRoute: React.FC<ConversationRouteProps> = props => {
   const { me } = props
   const { user } = useContext(SystemContext)
@@ -39,17 +43,21 @@ export const ConversationRoute: React.FC<ConversationRouteProps> = props => {
         <Title>Inbox | Artsy</Title>
 
         <Media at="xs">
+          {/* @ts-ignore */}
           <ConversationHeader partnerName={me.conversation.to.name} />
         </Media>
         <Media greaterThan="xs">
+          {/* @ts-ignore */}
           <FullHeader partnerName={me.conversation.to.name} />
         </Media>
         <Flex>
           <Media greaterThan="xs">
             <Conversations me={me as any} />
           </Media>
+          {/* @ts-ignore */}
           <Conversation conversation={me.conversation} />
           <Details
+            // @ts-ignore
             conversation={me.conversation as any /** FIXME: Correct type */}
             display={["none", null, null, null, "flex"]}
             width={["100%", "376px"]}

diff --git a/yarn.lock b/yarn.lock
@@ -21846,10 +21846,10 @@ typescript-template-language-service-decorator@^2.2.0:
   resolved "https://registry.yarnpkg.com/typescript-template-language-service-decorator/-/typescript-template-language-service-decorator-2.2.0.tgz#4ee6d580f307fb9239978e69626f2775b8a59b2a"
   integrity sha512-xiolqt1i7e22rpqMaprPgSFVgU64u3b9n6EJlAaUYE61jumipKAdI1+O5khPlWslpTUj80YzjUKjJ2jxT0D74w==
 
-typescript@3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
+typescript@^3.9.3:
+  version "3.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
+  integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
 
 [email protected], ua-parser-js@^0.7.18:
   version "0.7.19"