Skip to content

Commit 2725fc3

Browse files
joshuaellisjoshuaellis
authored
fix: fixes for typescript 4.8 (#1979)
1 parent d597678 commit 2725fc3

File tree

40 files changed

+1629
-513
lines changed

40 files changed

+1629
-513
lines changed

‎.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"typescript.tsdk": "node_modules/typescript/lib"
3+
}

‎demo/src/sandboxes/animating-auto/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"devDependencies": {
2525
"@types/react": "^18.0.8",
2626
"@types/react-dom": "^18.0.3",
27-
"typescript": "^4.2.3"
27+
"typescript": "^4.8.3"
2828
}
2929
}

‎demo/src/sandboxes/card/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"devDependencies": {
2525
"@types/react": "^18.0.8",
2626
"@types/react-dom": "^18.0.3",
27-
"typescript": "^4.2.3"
27+
"typescript": "^4.8.3"
2828
}
2929
}

‎demo/src/sandboxes/cards-stack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"devDependencies": {
2525
"@types/react": "^18.0.8",
2626
"@types/react-dom": "^18.0.3",
27-
"typescript": "^4.2.3"
27+
"typescript": "^4.8.3"
2828
}
2929
}

‎demo/src/sandboxes/chain/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"devDependencies": {
2424
"@types/react": "^18.0.8",
2525
"@types/react-dom": "^18.0.3",
26-
"typescript": "^4.2.3"
26+
"typescript": "^4.8.3"
2727
}
2828
}

‎demo/src/sandboxes/css-keyframes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"devDependencies": {
2424
"@types/react": "^18.0.8",
2525
"@types/react-dom": "^18.0.3",
26-
"typescript": "^4.2.3"
26+
"typescript": "^4.8.3"
2727
}
2828
}

‎demo/src/sandboxes/css-variables/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"devDependencies": {
2525
"@types/react": "^18.0.8",
2626
"@types/react-dom": "^18.0.3",
27-
"typescript": "^4.2.3"
27+
"typescript": "^4.8.3"
2828
}
2929
}

‎demo/src/sandboxes/draggable-list/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
"@types/lodash-es": "^4.17.4",
2828
"@types/react": "^18.0.8",
2929
"@types/react-dom": "^18.0.3",
30-
"typescript": "^4.2.3"
30+
"typescript": "^4.8.3"
3131
}
3232
}

‎demo/src/sandboxes/exit-before-enter/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"devDependencies": {
2424
"@types/react": "^18.0.8",
2525
"@types/react-dom": "^18.0.3",
26-
"typescript": "^4.2.3"
26+
"typescript": "^4.8.3"
2727
}
2828
}

‎demo/src/sandboxes/flip-card/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"devDependencies": {
2424
"@types/react": "^18.0.8",
2525
"@types/react-dom": "^18.0.3",
26-
"typescript": "^4.2.3"
26+
"typescript": "^4.8.3"
2727
}
2828
}

‎demo/src/sandboxes/goo-blobs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"devDependencies": {
2525
"@types/react": "^18.0.8",
2626
"@types/react-dom": "^18.0.3",
27-
"typescript": "^4.2.3"
27+
"typescript": "^4.8.3"
2828
}
2929
}

‎demo/src/sandboxes/image-fade/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"devDependencies": {
2424
"@types/react": "^18.0.8",
2525
"@types/react-dom": "^18.0.3",
26-
"typescript": "^4.2.3"
26+
"typescript": "^4.8.3"
2727
}
2828
}

‎demo/src/sandboxes/list-reordering/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"@types/lodash.shuffle": "4.2.6",
2727
"@types/react": "^18.0.8",
2828
"@types/react-dom": "^18.0.3",
29-
"typescript": "^4.2.3"
29+
"typescript": "^4.8.3"
3030
}
3131
}

‎demo/src/sandboxes/masonry/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
"@types/lodash.shuffle": "4.2.6",
2828
"@types/react": "^18.0.8",
2929
"@types/react-dom": "^18.0.3",
30-
"typescript": "^4.2.3"
30+
"typescript": "^4.8.3"
3131
}
3232
}

‎demo/src/sandboxes/multistage-transition/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"devDependencies": {
2424
"@types/react": "^18.0.8",
2525
"@types/react-dom": "^18.0.3",
26-
"typescript": "^4.2.3"
26+
"typescript": "^4.8.3"
2727
}
2828
}

‎demo/src/sandboxes/notification-hub/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"devDependencies": {
2727
"@types/react": "^18.0.8",
2828
"@types/react-dom": "^18.0.3",
29-
"typescript": "^4.2.3"
29+
"typescript": "^4.8.3"
3030
}
3131
}

‎demo/src/sandboxes/parallax-sticky/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"devDependencies": {
2525
"@types/react": "^18.0.8",
2626
"@types/react-dom": "^18.0.3",
27-
"typescript": "^4.2.3"
27+
"typescript": "^4.8.3"
2828
}
2929
}

‎demo/src/sandboxes/parallax-vert/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"devDependencies": {
2525
"@types/react": "^18.0.8",
2626
"@types/react-dom": "^18.0.3",
27-
"typescript": "^4.2.3"
27+
"typescript": "^4.8.3"
2828
}
2929
}

‎demo/src/sandboxes/parallax/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"devDependencies": {
2525
"@types/react": "^18.0.8",
2626
"@types/react-dom": "^18.0.3",
27-
"typescript": "^4.2.3"
27+
"typescript": "^4.8.3"
2828
}
2929
}

‎demo/src/sandboxes/rocket-decay/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"devDependencies": {
1717
"@types/react": "^18.0.8",
1818
"@types/react-dom": "^18.0.3",
19-
"typescript": "^4.2.3"
19+
"typescript": "^4.8.3"
2020
},
2121
"scripts": {
2222
"start": "react-scripts start",

‎demo/src/sandboxes/simple-transition/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"devDependencies": {
2424
"@types/react": "^18.0.8",
2525
"@types/react-dom": "^18.0.3",
26-
"typescript": "^4.2.3"
26+
"typescript": "^4.8.3"
2727
}
2828
}

‎demo/src/sandboxes/slide/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"devDependencies": {
2525
"@types/react": "^18.0.8",
2626
"@types/react-dom": "^18.0.3",
27-
"typescript": "^4.2.3"
27+
"typescript": "^4.8.3"
2828
}
2929
}

‎demo/src/sandboxes/svg-filter/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"devDependencies": {
2424
"@types/react": "^18.0.8",
2525
"@types/react-dom": "^18.0.3",
26-
"typescript": "^4.2.3"
26+
"typescript": "^4.8.3"
2727
}
2828
}

‎demo/src/sandboxes/trail/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"devDependencies": {
2424
"@types/react": "^18.0.8",
2525
"@types/react-dom": "^18.0.3",
26-
"typescript": "^4.2.3"
26+
"typescript": "^4.8.3"
2727
}
2828
}

‎demo/src/sandboxes/tree/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"@types/react": "^18.0.8",
2727
"@types/react-dom": "^18.0.3",
2828
"@types/styled-components": "^5.1.9",
29-
"typescript": "^4.2.3"
29+
"typescript": "^4.8.3"
3030
}
3131
}

‎demo/src/sandboxes/viewpager/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
"@types/lodash-es": "^4.17.4",
3030
"@types/react": "^18.0.8",
3131
"@types/react-dom": "^18.0.3",
32-
"typescript": "^4.2.3"
32+
"typescript": "^4.8.3"
3333
}
3434
}

‎package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@
6565
}
6666
},
6767
"devDependencies": {
68-
"@babel/core": "^7.13.10",
69-
"@babel/preset-env": "^7.13.12",
70-
"@babel/preset-react": "^7.12.13",
71-
"@babel/preset-typescript": "^7.13.0",
68+
"@babel/core": "^7.19.0",
69+
"@babel/preset-env": "^7.19.0",
70+
"@babel/preset-react": "^7.18.6",
71+
"@babel/preset-typescript": "^7.18.6",
7272
"@changesets/cli": "^2.20.0",
7373
"@commitlint/cli": "^16.2.1",
7474
"@commitlint/config-conventional": "^16.2.1",
75-
"@preconstruct/cli": "^2.1.5",
75+
"@preconstruct/cli": "^2.2.1",
7676
"@react-three/fiber": "^7.0.26",
7777
"@testing-library/cypress": "^8.0.2",
7878
"@testing-library/jest-dom": "^5.16.3",
@@ -108,8 +108,8 @@
108108
"start-server-and-test": "^1.14.0",
109109
"three": "^0.137.5",
110110
"ts-jest": "^27.1.3",
111-
"typescript": "^4.5.5",
112-
"vite": "^2.8.1",
111+
"typescript": "4.8.3",
112+
"vite": "^3.1.0",
113113
"zdog": "^1.1.3"
114114
},
115115
"publishConfig": {

‎packages/core/src/Controller.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ import {
2727
OnChange,
2828
OnRest,
2929
OnStart,
30+
SpringChain,
31+
SpringToFn,
3032
SpringValues,
3133
} from './types'
3234

@@ -401,7 +403,14 @@ export async function flushUpdate(
401403
resolve(getCancelledResult(ctrl))
402404
} else {
403405
props.onRest = onRest
404-
resolve(runAsync(asyncTo!, props, state, ctrl))
406+
resolve(
407+
runAsync(
408+
asyncTo as SpringChain | SpringToFn,
409+
props,
410+
state,
411+
ctrl
412+
)
413+
)
405414
}
406415
},
407416
},

‎packages/core/src/SpringValue.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ export class SpringValue<T = any> extends FrameValue<T> {
450450

451451
start(to: T, props?: SpringProps<T>): AsyncResult<this>
452452

453-
start(to?: T | SpringUpdate<T>, arg2?: SpringProps<T>) {
453+
start(to?: any, arg2?: any) {
454454
let queue: SpringUpdate<T>[]
455455
if (!is.und(to)) {
456456
queue = [is.obj(to) ? to : { ...arg2, to }]

‎packages/core/src/hooks/useSpring.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Remap } from '@react-spring/types'
1+
import { Lookup, Remap } from '@react-spring/types'
22
import { is } from '@react-spring/shared'
33

44
import { ControllerUpdate, PickAnimated, SpringValues } from '../types'
@@ -10,7 +10,7 @@ import { useSprings } from './useSprings'
1010
* The props that `useSpring` recognizes.
1111
*/
1212
export type UseSpringProps<Props extends object = any> = unknown &
13-
PickAnimated<Props> extends infer State
13+
PickAnimated<Props> extends infer State extends Lookup<any>
1414
? Remap<
1515
ControllerUpdate<State> & {
1616
/**
@@ -32,7 +32,7 @@ export function useSpring<Props extends object>(
3232
| Function
3333
| (() => (Props & Valid<Props, UseSpringProps<Props>>) | UseSpringProps),
3434
deps?: readonly any[] | undefined
35-
): PickAnimated<Props> extends infer State
35+
): PickAnimated<Props> extends infer State extends Lookup<any>
3636
? [SpringValues<State>, SpringRef<State>]
3737
: never
3838

@@ -49,7 +49,7 @@ export function useSpring<Props extends object>(
4949
export function useSpring<Props extends object>(
5050
props: (Props & Valid<Props, UseSpringProps<Props>>) | UseSpringProps,
5151
deps: readonly any[] | undefined
52-
): PickAnimated<Props> extends infer State
52+
): PickAnimated<Props> extends infer State extends Lookup<any>
5353
? [SpringValues<State>, SpringRef<State>]
5454
: never
5555

‎packages/core/src/hooks/useSprings.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export function useSprings<Props extends UseSpringProps>(
4343
length: number,
4444
props: (i: number, ctrl: Controller) => Props,
4545
deps?: readonly any[]
46-
): PickAnimated<Props> extends infer State
46+
): PickAnimated<Props> extends infer State extends Lookup<any>
4747
? [SpringValues<State>[], SpringRefType<State>]
4848
: never
4949

@@ -62,7 +62,7 @@ export function useSprings<Props extends UseSpringsProps>(
6262
length: number,
6363
props: Props[] & UseSpringsProps<PickAnimated<Props>>[],
6464
deps: readonly any[] | undefined
65-
): PickAnimated<Props> extends infer State
65+
): PickAnimated<Props> extends infer State extends Lookup<any>
6666
? [SpringValues<State>[], SpringRefType<State>]
6767
: never
6868

‎packages/core/src/hooks/useTrail.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { each, is, useIsomorphicLayoutEffect } from '@react-spring/shared'
2+
import { Lookup } from '@react-spring/types'
23

34
import { Valid } from '../types/common'
45
import { PickAnimated, SpringValues, AsyncResult } from '../types'
@@ -18,7 +19,7 @@ export function useTrail<Props extends object>(
1819
ctrl: Controller
1920
) => UseTrailProps | (Props & Valid<Props, UseTrailProps<Props>>),
2021
deps?: readonly any[]
21-
): PickAnimated<Props> extends infer State
22+
): PickAnimated<Props> extends infer State extends Lookup<any>
2223
? [SpringValues<State>[], SpringRef<State>]
2324
: never
2425

@@ -31,7 +32,7 @@ export function useTrail<Props extends object>(
3132
length: number,
3233
props: UseTrailProps | (Props & Valid<Props, UseTrailProps<Props>>),
3334
deps: readonly any[]
34-
): PickAnimated<Props> extends infer State
35+
): PickAnimated<Props> extends infer State extends Lookup<any>
3536
? [SpringValues<State>[], SpringRef<State>]
3637
: never
3738

‎packages/core/src/hooks/useTransition.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react'
22
import { useContext, useRef, useMemo } from 'react'
3-
import { OneOrMore, UnknownProps } from '@react-spring/types'
3+
import { Lookup, OneOrMore, UnknownProps } from '@react-spring/types'
44
import {
55
is,
66
toArray,
@@ -45,7 +45,7 @@ export function useTransition<Item, Props extends object>(
4545
| UseTransitionProps<Item>
4646
| (Props & Valid<Props, UseTransitionProps<Item>>),
4747
deps?: any[]
48-
): PickAnimated<Props> extends infer State
48+
): PickAnimated<Props> extends infer State extends Lookup
4949
? [TransitionFn<Item, PickAnimated<Props>>, SpringRefType<State>]
5050
: never
5151

@@ -62,7 +62,7 @@ export function useTransition<Item, Props extends object>(
6262
| UseTransitionProps<Item>
6363
| (Props & Valid<Props, UseTransitionProps<Item>>),
6464
deps: any[] | undefined
65-
): PickAnimated<Props> extends infer State
65+
): PickAnimated<Props> extends infer State extends Lookup
6666
? [TransitionFn<Item, State>, SpringRefType<State>]
6767
: never
6868

‎packages/core/src/interpolate.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { SpringValue } from './SpringValue'
1010
import { to } from './interpolate'
1111

1212
function spring<T>(value: T): SpringValue<T> {
13-
return new SpringValue(value)
13+
return new SpringValue(value!)
1414
}
1515

1616
describe('AnimatedValue interpolation options', () => {

‎packages/core/src/types/props.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export type GoalProp<T> = [T] extends [IsPlainObject<T>]
106106
: GoalValue<T>
107107

108108
/** A set of values for a `Controller` to animate from/to. */
109-
export type GoalValues<T extends Lookup> = FluidProps<T> extends infer Props
109+
export type GoalValues<T> = FluidProps<T> extends infer Props
110110
? { [P in keyof Props]?: Props[P] | null }
111111
: never
112112

‎packages/parallax/test/vite.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,8 @@ export default defineConfig({
1111
),
1212
},
1313
},
14+
server: {
15+
port: 3000,
16+
},
1417
plugins: [reactRefresh()],
1518
})

0 commit comments

Comments
 (0)