8668020a54
Typescript published 4.8.2 today and it fails CI, bump our typescript version to 4.8.2 and tweak some typings to make existing e2e typescript tests work properly * Bump web-vitals from 3.0.0-beta to 3.0.0 stable for typing fix (there's an undefined type but it wasn't caught by ts 4.7), also force compiled it as CJS for pre-compiled * Bump ncc to 3.34.0 for ts-loader compatibility for new typescript version, ncc 3.33.x cannot work with ts 4.8 * Update pre-compiled
41 lines
1.1 KiB
TypeScript
41 lines
1.1 KiB
TypeScript
import React from 'react'
|
|
import type {
|
|
BaseContext,
|
|
NextComponentType,
|
|
NextPageContext,
|
|
} from '../shared/lib/utils'
|
|
import type { NextRouter } from './router'
|
|
import { useRouter } from './router'
|
|
|
|
export type WithRouterProps = {
|
|
router: NextRouter
|
|
}
|
|
|
|
export type ExcludeRouterProps<P> = Pick<
|
|
P,
|
|
Exclude<keyof P, keyof WithRouterProps>
|
|
>
|
|
|
|
export default function withRouter<
|
|
P extends WithRouterProps,
|
|
C extends BaseContext = NextPageContext
|
|
>(
|
|
ComposedComponent: NextComponentType<C, any, P>
|
|
): React.ComponentType<ExcludeRouterProps<P>> {
|
|
function WithRouterWrapper(props: any): JSX.Element {
|
|
return <ComposedComponent router={useRouter()} {...props} />
|
|
}
|
|
|
|
WithRouterWrapper.getInitialProps = ComposedComponent.getInitialProps
|
|
// This is needed to allow checking for custom getInitialProps in _app
|
|
;(WithRouterWrapper as any).origGetInitialProps = (
|
|
ComposedComponent as any
|
|
).origGetInitialProps
|
|
if (process.env.NODE_ENV !== 'production') {
|
|
const name =
|
|
ComposedComponent.displayName || ComposedComponent.name || 'Unknown'
|
|
WithRouterWrapper.displayName = `withRouter(${name})`
|
|
}
|
|
|
|
return WithRouterWrapper
|
|
}
|