From 1b3bc5c262b7e26d7347271311db10074da1c99d Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Sat, 29 Feb 2020 17:23:59 -0500
Subject: [PATCH] Consistently Type GS(S)P

---
 packages/next/next-server/server/render.tsx | 10 +++-------
 packages/next/types/index.d.ts              |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/next/next-server/server/render.tsx b/packages/next/next-server/server/render.tsx
index 61dac77e4d4aa73..64e393d7371787a 100644
--- a/packages/next/next-server/server/render.tsx
+++ b/packages/next/next-server/server/render.tsx
@@ -471,11 +471,7 @@ export async function renderToHTML(
       // invoke, where we'd have to consider server & serverless.
       const previewData = tryGetPreviewData(req, res, previewProps)
       const data = await getStaticProps!({
-        ...(pageIsDynamic
-          ? {
-              params: query as ParsedUrlQuery,
-            }
-          : { params: undefined }),
+        ...(pageIsDynamic ? { params: query as ParsedUrlQuery } : undefined),
         ...(previewData !== false
           ? { preview: true, previewData: previewData }
           : undefined),
@@ -534,10 +530,10 @@ export async function renderToHTML(
 
   if (getServerSideProps && !isFallback) {
     const data = await getServerSideProps({
-      params,
-      query,
       req,
       res,
+      ...(pageIsDynamic ? { params: params as ParsedUrlQuery } : undefined),
+      query,
     })
 
     const invalidKeys = Object.keys(data).filter(key => key !== 'props')
diff --git a/packages/next/types/index.d.ts b/packages/next/types/index.d.ts
index 986e551fec9ed02..0c77c3bedf799cc 100644
--- a/packages/next/types/index.d.ts
+++ b/packages/next/types/index.d.ts
@@ -65,7 +65,7 @@ export {
 }
 
 export type GetStaticProps = (ctx: {
-  params: ParsedUrlQuery | undefined
+  params?: ParsedUrlQuery
   preview?: boolean
   previewData?: any
 }) => Promise<{
@@ -79,9 +79,9 @@ export type GetStaticPaths = () => Promise<{
 }>
 
 export type GetServerSideProps = (context: {
-  params: ParsedUrlQuery | undefined
   req: IncomingMessage
   res: ServerResponse
+  params?: ParsedUrlQuery
   query: ParsedUrlQuery
 }) => Promise<{ [key: string]: any }>