fix: fixes for typescript 4.8 (#1979)

joshuaellis · web-flow · commit 2725fc328b4c · 2022-09-11T19:02:36.000+01:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "typescript.tsdk": "node_modules/typescript/lib"
+}
diff --git a/demo/src/sandboxes/animating-auto/package.json b/demo/src/sandboxes/animating-auto/package.json
@@ -24,6 +24,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/card/package.json b/demo/src/sandboxes/card/package.json
@@ -24,6 +24,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/cards-stack/package.json b/demo/src/sandboxes/cards-stack/package.json
@@ -24,6 +24,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/chain/package.json b/demo/src/sandboxes/chain/package.json
@@ -23,6 +23,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/css-keyframes/package.json b/demo/src/sandboxes/css-keyframes/package.json
@@ -23,6 +23,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/css-variables/package.json b/demo/src/sandboxes/css-variables/package.json
@@ -24,6 +24,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/draggable-list/package.json b/demo/src/sandboxes/draggable-list/package.json
@@ -27,6 +27,6 @@
     "@types/lodash-es": "^4.17.4",
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/exit-before-enter/package.json b/demo/src/sandboxes/exit-before-enter/package.json
@@ -23,6 +23,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/flip-card/package.json b/demo/src/sandboxes/flip-card/package.json
@@ -23,6 +23,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/goo-blobs/package.json b/demo/src/sandboxes/goo-blobs/package.json
@@ -24,6 +24,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/image-fade/package.json b/demo/src/sandboxes/image-fade/package.json
@@ -23,6 +23,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/list-reordering/package.json b/demo/src/sandboxes/list-reordering/package.json
@@ -26,6 +26,6 @@
     "@types/lodash.shuffle": "4.2.6",
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/masonry/package.json b/demo/src/sandboxes/masonry/package.json
@@ -27,6 +27,6 @@
     "@types/lodash.shuffle": "4.2.6",
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/multistage-transition/package.json b/demo/src/sandboxes/multistage-transition/package.json
@@ -23,6 +23,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/notification-hub/package.json b/demo/src/sandboxes/notification-hub/package.json
@@ -26,6 +26,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/parallax-sticky/package.json b/demo/src/sandboxes/parallax-sticky/package.json
@@ -24,6 +24,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/parallax-vert/package.json b/demo/src/sandboxes/parallax-vert/package.json
@@ -24,6 +24,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/parallax/package.json b/demo/src/sandboxes/parallax/package.json
@@ -24,6 +24,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/rocket-decay/package.json b/demo/src/sandboxes/rocket-decay/package.json
@@ -16,7 +16,7 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   },
   "scripts": {
     "start": "react-scripts start",
diff --git a/demo/src/sandboxes/simple-transition/package.json b/demo/src/sandboxes/simple-transition/package.json
@@ -23,6 +23,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/slide/package.json b/demo/src/sandboxes/slide/package.json
@@ -24,6 +24,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/svg-filter/package.json b/demo/src/sandboxes/svg-filter/package.json
@@ -23,6 +23,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/trail/package.json b/demo/src/sandboxes/trail/package.json
@@ -23,6 +23,6 @@
   "devDependencies": {
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/tree/package.json b/demo/src/sandboxes/tree/package.json
@@ -26,6 +26,6 @@
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
     "@types/styled-components": "^5.1.9",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/demo/src/sandboxes/viewpager/package.json b/demo/src/sandboxes/viewpager/package.json
@@ -29,6 +29,6 @@
     "@types/lodash-es": "^4.17.4",
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.3",
-    "typescript": "^4.2.3"
+    "typescript": "^4.8.3"
   }
 }
diff --git a/package.json b/package.json
@@ -65,14 +65,14 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.13.10",
-    "@babel/preset-env": "^7.13.12",
-    "@babel/preset-react": "^7.12.13",
-    "@babel/preset-typescript": "^7.13.0",
+    "@babel/core": "^7.19.0",
+    "@babel/preset-env": "^7.19.0",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/preset-typescript": "^7.18.6",
     "@changesets/cli": "^2.20.0",
     "@commitlint/cli": "^16.2.1",
     "@commitlint/config-conventional": "^16.2.1",
-    "@preconstruct/cli": "^2.1.5",
+    "@preconstruct/cli": "^2.2.1",
     "@react-three/fiber": "^7.0.26",
     "@testing-library/cypress": "^8.0.2",
     "@testing-library/jest-dom": "^5.16.3",
@@ -108,8 +108,8 @@
     "start-server-and-test": "^1.14.0",
     "three": "^0.137.5",
     "ts-jest": "^27.1.3",
-    "typescript": "^4.5.5",
-    "vite": "^2.8.1",
+    "typescript": "4.8.3",
+    "vite": "^3.1.0",
     "zdog": "^1.1.3"
   },
   "publishConfig": {
diff --git a/packages/core/src/Controller.ts b/packages/core/src/Controller.ts
@@ -27,6 +27,8 @@ import {
   OnChange,
   OnRest,
   OnStart,
+  SpringChain,
+  SpringToFn,
   SpringValues,
 } from './types'
 
@@ -401,7 +403,14 @@ export async function flushUpdate(
               resolve(getCancelledResult(ctrl))
             } else {
               props.onRest = onRest
-              resolve(runAsync(asyncTo!, props, state, ctrl))
+              resolve(
+                runAsync(
+                  asyncTo as SpringChain | SpringToFn,
+                  props,
+                  state,
+                  ctrl
+                )
+              )
             }
           },
         },
diff --git a/packages/core/src/SpringValue.ts b/packages/core/src/SpringValue.ts
@@ -450,7 +450,7 @@ export class SpringValue<T = any> extends FrameValue<T> {
 
   start(to: T, props?: SpringProps<T>): AsyncResult<this>
 
-  start(to?: T | SpringUpdate<T>, arg2?: SpringProps<T>) {
+  start(to?: any, arg2?: any) {
     let queue: SpringUpdate<T>[]
     if (!is.und(to)) {
       queue = [is.obj(to) ? to : { ...arg2, to }]
diff --git a/packages/core/src/hooks/useSpring.ts b/packages/core/src/hooks/useSpring.ts
@@ -1,4 +1,4 @@
-import { Remap } from '@react-spring/types'
+import { Lookup, Remap } from '@react-spring/types'
 import { is } from '@react-spring/shared'
 
 import { ControllerUpdate, PickAnimated, SpringValues } from '../types'
@@ -10,7 +10,7 @@ import { useSprings } from './useSprings'
  * The props that `useSpring` recognizes.
  */
 export type UseSpringProps<Props extends object = any> = unknown &
-  PickAnimated<Props> extends infer State
+  PickAnimated<Props> extends infer State extends Lookup<any>
   ? Remap<
       ControllerUpdate<State> & {
         /**
@@ -32,7 +32,7 @@ export function useSpring<Props extends object>(
     | Function
     | (() => (Props & Valid<Props, UseSpringProps<Props>>) | UseSpringProps),
   deps?: readonly any[] | undefined
-): PickAnimated<Props> extends infer State
+): PickAnimated<Props> extends infer State extends Lookup<any> 
   ? [SpringValues<State>, SpringRef<State>]
   : never
 
@@ -49,7 +49,7 @@ export function useSpring<Props extends object>(
 export function useSpring<Props extends object>(
   props: (Props & Valid<Props, UseSpringProps<Props>>) | UseSpringProps,
   deps: readonly any[] | undefined
-): PickAnimated<Props> extends infer State
+): PickAnimated<Props> extends infer State extends Lookup<any>
   ? [SpringValues<State>, SpringRef<State>]
   : never
 
diff --git a/packages/core/src/hooks/useSprings.ts b/packages/core/src/hooks/useSprings.ts
@@ -43,7 +43,7 @@ export function useSprings<Props extends UseSpringProps>(
   length: number,
   props: (i: number, ctrl: Controller) => Props,
   deps?: readonly any[]
-): PickAnimated<Props> extends infer State
+): PickAnimated<Props> extends infer State extends Lookup<any>
   ? [SpringValues<State>[], SpringRefType<State>]
   : never
 
@@ -62,7 +62,7 @@ export function useSprings<Props extends UseSpringsProps>(
   length: number,
   props: Props[] & UseSpringsProps<PickAnimated<Props>>[],
   deps: readonly any[] | undefined
-): PickAnimated<Props> extends infer State
+): PickAnimated<Props> extends infer State extends Lookup<any>
   ? [SpringValues<State>[], SpringRefType<State>]
   : never
 
diff --git a/packages/core/src/hooks/useTrail.ts b/packages/core/src/hooks/useTrail.ts
@@ -1,4 +1,5 @@
 import { each, is, useIsomorphicLayoutEffect } from '@react-spring/shared'
+import { Lookup } from '@react-spring/types'
 
 import { Valid } from '../types/common'
 import { PickAnimated, SpringValues, AsyncResult } from '../types'
@@ -18,7 +19,7 @@ export function useTrail<Props extends object>(
     ctrl: Controller
   ) => UseTrailProps | (Props & Valid<Props, UseTrailProps<Props>>),
   deps?: readonly any[]
-): PickAnimated<Props> extends infer State
+): PickAnimated<Props> extends infer State extends Lookup<any>
   ? [SpringValues<State>[], SpringRef<State>]
   : never
 
@@ -31,7 +32,7 @@ export function useTrail<Props extends object>(
   length: number,
   props: UseTrailProps | (Props & Valid<Props, UseTrailProps<Props>>),
   deps: readonly any[]
-): PickAnimated<Props> extends infer State
+): PickAnimated<Props> extends infer State extends Lookup<any>
   ? [SpringValues<State>[], SpringRef<State>]
   : never
 
diff --git a/packages/core/src/hooks/useTransition.tsx b/packages/core/src/hooks/useTransition.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { useContext, useRef, useMemo } from 'react'
-import { OneOrMore, UnknownProps } from '@react-spring/types'
+import { Lookup, OneOrMore, UnknownProps } from '@react-spring/types'
 import {
   is,
   toArray,
@@ -45,7 +45,7 @@ export function useTransition<Item, Props extends object>(
     | UseTransitionProps<Item>
     | (Props & Valid<Props, UseTransitionProps<Item>>),
   deps?: any[]
-): PickAnimated<Props> extends infer State
+): PickAnimated<Props> extends infer State extends Lookup
   ? [TransitionFn<Item, PickAnimated<Props>>, SpringRefType<State>]
   : never
 
@@ -62,7 +62,7 @@ export function useTransition<Item, Props extends object>(
     | UseTransitionProps<Item>
     | (Props & Valid<Props, UseTransitionProps<Item>>),
   deps: any[] | undefined
-): PickAnimated<Props> extends infer State
+): PickAnimated<Props> extends infer State extends Lookup
   ? [TransitionFn<Item, State>, SpringRefType<State>]
   : never
 
diff --git a/packages/core/src/interpolate.test.ts b/packages/core/src/interpolate.test.ts
@@ -10,7 +10,7 @@ import { SpringValue } from './SpringValue'
 import { to } from './interpolate'
 
 function spring<T>(value: T): SpringValue<T> {
-  return new SpringValue(value)
+  return new SpringValue(value!)
 }
 
 describe('AnimatedValue interpolation options', () => {
diff --git a/packages/core/src/types/props.ts b/packages/core/src/types/props.ts
@@ -106,7 +106,7 @@ export type GoalProp<T> = [T] extends [IsPlainObject<T>]
   : GoalValue<T>
 
 /** A set of values for a `Controller` to animate from/to. */
-export type GoalValues<T extends Lookup> = FluidProps<T> extends infer Props
+export type GoalValues<T> = FluidProps<T> extends infer Props
   ? { [P in keyof Props]?: Props[P] | null }
   : never
 
diff --git a/packages/parallax/test/vite.config.ts b/packages/parallax/test/vite.config.ts
@@ -11,5 +11,8 @@ export default defineConfig({
       ),
     },
   },
+  server: {
+    port: 3000,
+  },
   plugins: [reactRefresh()],
 })
diff --git a/packages/types/util.d.ts b/packages/types/util.d.ts
diff --git a/targets/web/src/animated.test.tsx b/targets/web/src/animated.test.tsx
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "typescript.tsdk": "node_modules/typescript/lib"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@`
`24`	`24`	`"devDependencies": {`
`25`	`25`	`"@types/react": "^18.0.8",`
`26`	`26`	`"@types/react-dom": "^18.0.3",`
`27`		`- "typescript": "^4.2.3"`
	`27`	`+ "typescript": "^4.8.3"`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@`
`23`	`23`	`"devDependencies": {`
`24`	`24`	`"@types/react": "^18.0.8",`
`25`	`25`	`"@types/react-dom": "^18.0.3",`
`26`		`- "typescript": "^4.2.3"`
	`26`	`+ "typescript": "^4.8.3"`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@`
`27`	`27`	`"@types/lodash-es": "^4.17.4",`
`28`	`28`	`"@types/react": "^18.0.8",`
`29`	`29`	`"@types/react-dom": "^18.0.3",`
`30`		`- "typescript": "^4.2.3"`
	`30`	`+ "typescript": "^4.8.3"`
`31`	`31`	`}`
`32`	`32`	`}`