Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CoCo_Code_Op2
next.js
提交
356636c8
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,发现更多精彩内容 >>
提交
356636c8
编写于
6月 28, 2019
作者:
J
JJ Kasper
提交者:
Joe Haddad
6月 28, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add updated de-duping logic for next/dynamic (#7705)
上级
7049c3b3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
34 addition
and
40 deletion
+34
-40
packages/next-server/lib/utils.ts
packages/next-server/lib/utils.ts
+1
-1
packages/next-server/server/get-dynamic-import-bundles.ts
packages/next-server/server/get-dynamic-import-bundles.ts
+0
-28
packages/next-server/server/render.tsx
packages/next-server/server/render.tsx
+24
-11
packages/next/build/webpack/plugins/react-loadable-plugin.ts
packages/next/build/webpack/plugins/react-loadable-plugin.ts
+9
-0
未找到文件。
packages/next-server/lib/utils.ts
浏览文件 @
356636c8
...
...
@@ -2,7 +2,7 @@ import { format, UrlObject, URLFormatOptions } from 'url'
import
{
ServerResponse
,
IncomingMessage
}
from
'
http
'
import
{
ComponentType
}
from
'
react
'
import
{
ParsedUrlQuery
}
from
'
querystring
'
import
{
ManifestItem
}
from
'
../server/
get-dynamic-import-bundles
'
import
{
ManifestItem
}
from
'
../server/
render
'
import
{
BaseRouter
}
from
'
./router/router
'
/**
...
...
packages/next-server/server/get-dynamic-import-bundles.ts
已删除
100644 → 0
浏览文件 @
7049c3b3
export
type
ManifestItem
=
{
id
:
number
|
string
name
:
string
file
:
string
publicPath
:
string
}
export
type
Manifest
=
{
[
moduleId
:
string
]:
ManifestItem
[]
}
type
DynamicImportBundles
=
Set
<
ManifestItem
>
// Based on https://github.com/jamiebuilds/react-loadable/pull/132
export
function
getDynamicImportBundles
(
manifest
:
Manifest
,
moduleIds
:
string
[]
):
DynamicImportBundles
{
return
moduleIds
.
reduce
(
(
bundles
:
DynamicImportBundles
,
moduleId
:
string
):
DynamicImportBundles
=>
{
if
(
typeof
manifest
[
moduleId
]
===
'
undefined
'
)
{
return
bundles
}
manifest
[
moduleId
].
map
(
item
=>
bundles
.
add
(
item
))
return
bundles
},
new
Set
()
)
}
packages/next-server/server/render.tsx
浏览文件 @
356636c8
...
...
@@ -24,17 +24,21 @@ import { RequestContext } from '../lib/request-context'
import
{
LoadableContext
}
from
'
../lib/loadable-context
'
import
{
RouterContext
}
from
'
../lib/router-context
'
import
{
DataManager
}
from
'
../lib/data-manager
'
import
{
ManifestItem
,
getDynamicImportBundles
,
Manifest
as
ReactLoadableManifest
,
}
from
'
./get-dynamic-import-bundles
'
import
{
getPageFiles
,
BuildManifest
}
from
'
./get-page-files
'
import
{
AmpStateContext
}
from
'
../lib/amp-context
'
import
optimizeAmp
from
'
./optimize-amp
'
import
{
isInAmpMode
}
from
'
../lib/amp
'
import
{
IPageConfig
}
from
'
./load-components
'
export
type
ManifestItem
=
{
id
:
number
|
string
name
:
string
file
:
string
publicPath
:
string
}
type
ReactLoadableManifest
=
{
[
moduleId
:
string
]:
ManifestItem
[]
}
function
noRouter
()
{
const
message
=
'
No router instance found. you should only use "next/router" inside the client side of your app. https://err.sh/zeit/next.js/no-router-instance
'
...
...
@@ -468,12 +472,21 @@ export async function renderToHTML(
return
dataManagerData
}
const
dynamicImports
=
[
...
getDynamicImportBundles
(
reactLoadableManifest
,
reactLoadableModules
),
]
const
dynamicImportsIds
:
any
=
[
...
new
Set
(
dynamicImports
.
map
(
bundle
=>
bundle
.
id
)),
]
const
dynamicImportIdsSet
=
new
Set
<
string
>
()
const
dynamicImports
:
ManifestItem
[]
=
[]
for
(
const
mod
of
reactLoadableModules
)
{
const
manifestItem
=
reactLoadableManifest
[
mod
]
if
(
manifestItem
)
{
manifestItem
.
map
(
item
=>
{
dynamicImports
.
push
(
item
)
dynamicImportIdsSet
.
add
(
item
.
id
as
string
)
})
}
}
const
dynamicImportsIds
=
[...
dynamicImportIdsSet
]
const
inAmpMode
=
isInAmpMode
(
ampState
)
const
hybridAmp
=
ampState
.
hybrid
...
...
packages/next/build/webpack/plugins/react-loadable-plugin.ts
浏览文件 @
356636c8
...
...
@@ -61,6 +61,15 @@ function buildManifest(
manifest
[
request
]
=
[]
}
// Avoid duplicate files
if
(
manifest
[
request
].
some
(
item
=>
item
.
id
===
id
&&
item
.
file
===
file
)
)
{
continue
}
manifest
[
request
].
push
({
id
,
name
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录