Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
b7f77905
Unverified
Commit
b7f77905
authored
Feb 29, 2020
by
Joe Haddad
Committed by
GitHub
Feb 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Consistently Type GS(S)P (#10757)
parent
e608c86b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
render.tsx
packages/next/next-server/server/render.tsx
+3
-7
index.d.ts
packages/next/types/index.d.ts
+2
-2
No files found.
packages/next/next-server/server/render.tsx
View file @
b7f77905
...
@@ -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'
)
...
...
packages/next/types/index.d.ts
View file @
b7f77905
...
@@ -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
}
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment