Unverified Commit b7f77905 authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

Consistently Type GS(S)P (#10757)

parent e608c86b
...@@ -471,11 +471,7 @@ export async function renderToHTML( ...@@ -471,11 +471,7 @@ export async function renderToHTML(
// invoke, where we'd have to consider server & serverless. // invoke, where we'd have to consider server & serverless.
const previewData = tryGetPreviewData(req, res, previewProps) const previewData = tryGetPreviewData(req, res, previewProps)
const data = await getStaticProps!({ const data = await getStaticProps!({
...(pageIsDynamic ...(pageIsDynamic ? { params: query as ParsedUrlQuery } : undefined),
? {
params: query as ParsedUrlQuery,
}
: { params: undefined }),
...(previewData !== false ...(previewData !== false
? { preview: true, previewData: previewData } ? { preview: true, previewData: previewData }
: undefined), : undefined),
...@@ -534,10 +530,10 @@ export async function renderToHTML( ...@@ -534,10 +530,10 @@ export async function renderToHTML(
if (getServerSideProps && !isFallback) { if (getServerSideProps && !isFallback) {
const data = await getServerSideProps({ const data = await getServerSideProps({
params,
query,
req, req,
res, res,
...(pageIsDynamic ? { params: params as ParsedUrlQuery } : undefined),
query,
}) })
const invalidKeys = Object.keys(data).filter(key => key !== 'props') const invalidKeys = Object.keys(data).filter(key => key !== 'props')
......
...@@ -65,7 +65,7 @@ export { ...@@ -65,7 +65,7 @@ export {
} }
export type GetStaticProps = (ctx: { export type GetStaticProps = (ctx: {
params: ParsedUrlQuery | undefined params?: ParsedUrlQuery
preview?: boolean preview?: boolean
previewData?: any previewData?: any
}) => Promise<{ }) => Promise<{
...@@ -79,9 +79,9 @@ export type GetStaticPaths = () => Promise<{ ...@@ -79,9 +79,9 @@ export type GetStaticPaths = () => Promise<{
}> }>
export type GetServerSideProps = (context: { export type GetServerSideProps = (context: {
params: ParsedUrlQuery | undefined
req: IncomingMessage req: IncomingMessage
res: ServerResponse res: ServerResponse
params?: ParsedUrlQuery
query: ParsedUrlQuery query: ParsedUrlQuery
}) => Promise<{ [key: string]: any }> }) => Promise<{ [key: string]: any }>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment