Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CoCo_Code_Op2
next.js
提交
2972c068
N
next.js
项目概览
CoCo_Code_Op2
/
next.js
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
N
next.js
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
2972c068
编写于
10月 27, 2020
作者:
J
Joe Haddad
提交者:
GitHub
10月 27, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve type for GSP return type (#18285)
上级
4782bda3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
23 deletion
+21
-23
packages/next/next-server/server/render.tsx
packages/next/next-server/server/render.tsx
+14
-8
packages/next/types/index.d.ts
packages/next/types/index.d.ts
+7
-15
未找到文件。
packages/next/next-server/server/render.tsx
浏览文件 @
2972c068
...
...
@@ -636,7 +636,7 @@ export async function renderToHTML(
throw
new
Error
(
invalidKeysMsg
(
'
getStaticProps
'
,
invalidKeys
))
}
if
(
data
.
unstable_notFound
)
{
if
(
'
unstable_notFound
'
in
data
&&
data
.
unstable_notFound
)
{
if
(
pathname
===
'
/404
'
)
{
throw
new
Error
(
`The /404 page can not return unstable_notFound in "getStaticProps", please remove it to continue!`
...
...
@@ -649,6 +649,7 @@ export async function renderToHTML(
}
if
(
'
unstable_redirect
'
in
data
&&
data
.
unstable_redirect
&&
typeof
data
.
unstable_redirect
===
'
object
'
)
{
...
...
@@ -662,7 +663,7 @@ export async function renderToHTML(
}
if
(
isDataReq
)
{
data
.
props
=
{
;(
data
as
any
)
.
props
=
{
__N_REDIRECT
:
data
.
unstable_redirect
.
destination
,
}
}
else
{
...
...
@@ -673,7 +674,7 @@ export async function renderToHTML(
if
(
(
dev
||
isBuildTimeSSG
)
&&
!
isSerializableProps
(
pathname
,
'
getStaticProps
'
,
data
.
props
)
!
isSerializableProps
(
pathname
,
'
getStaticProps
'
,
(
data
as
any
)
.
props
)
)
{
// this fn should throw an error instead of ever returning `false`
throw
new
Error
(
...
...
@@ -681,7 +682,7 @@ export async function renderToHTML(
)
}
if
(
typeof
data
.
revalidate
===
'
number
'
)
{
if
(
'
revalidate
'
in
data
&&
typeof
data
.
revalidate
===
'
number
'
)
{
if
(
!
Number
.
isInteger
(
data
.
revalidate
))
{
throw
new
Error
(
`A page's revalidate option must be seconds expressed as a natural number. Mixed numbers, such as '
${
data
.
revalidate
}
', cannot be used.`
+
...
...
@@ -702,20 +703,25 @@ export async function renderToHTML(
`\nTo only run getStaticProps at build-time and not revalidate at runtime, you can set
\`
revalidate
\`
to
\`
false
\`
!`
)
}
}
else
if
(
data
.
revalidate
===
true
)
{
}
else
if
(
'
revalidate
'
in
data
&&
data
.
revalidate
===
true
)
{
// When enabled, revalidate after 1 second. This value is optimal for
// the most up-to-date page possible, but without a 1-to-1
// request-refresh ratio.
data
.
revalidate
=
1
}
else
{
// By default, we never revalidate.
data
.
revalidate
=
false
;(
data
as
any
)
.
revalidate
=
false
}
props
.
pageProps
=
Object
.
assign
({},
props
.
pageProps
,
data
.
props
)
props
.
pageProps
=
Object
.
assign
(
{},
props
.
pageProps
,
'
props
'
in
data
?
data
.
props
:
undefined
)
// pass up revalidate and props for export
// TODO: change this to a different passing mechanism
;(
renderOpts
as
any
).
revalidate
=
data
.
revalidate
;(
renderOpts
as
any
).
revalidate
=
'
revalidate
'
in
data
?
data
.
revalidate
:
undefined
;(
renderOpts
as
any
).
pageData
=
props
}
...
...
packages/next/types/index.d.ts
浏览文件 @
2972c068
...
...
@@ -85,12 +85,10 @@ export type GetStaticPropsContext<Q extends ParsedUrlQuery = ParsedUrlQuery> = {
locales
?:
string
[]
}
export
type
GetStaticPropsResult
<
P
>
=
{
props
?:
P
revalidate
?:
number
|
boolean
unstable_redirect
?:
Redirect
unstable_notFound
?:
true
}
export
type
GetStaticPropsResult
<
P
>
=
|
{
props
:
P
;
revalidate
?:
number
|
boolean
}
|
{
unstable_redirect
:
Redirect
;
revalidate
?:
number
|
boolean
}
|
{
unstable_notFound
:
true
}
export
type
GetStaticProps
<
P
extends
{
[
key
:
string
]:
any
}
=
{
[
key
:
string
]:
any
},
...
...
@@ -133,15 +131,9 @@ export type GetServerSidePropsContext<
}
export
type
GetServerSidePropsResult
<
P
>
=
|
{
props
:
P
}
|
{
unstable_redirect
:
Redirect
}
|
{
unstable_notFound
:
true
}
|
{
props
:
P
}
|
{
unstable_redirect
:
Redirect
}
|
{
unstable_notFound
:
true
}
export
type
GetServerSideProps
<
P
extends
{
[
key
:
string
]:
any
}
=
{
[
key
:
string
]:
any
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录