-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: merge chunk & optimize meta loading #1906
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,43 +1,41 @@ | ||
// This will bundle all the site demos and meta data into one file | ||
// which should only async load on search | ||
const filesMetaTabs = { | ||
{{#metaFiles}} | ||
{{#tabs}} | ||
'{{{id}}}': {{{tabs}}}, | ||
{{/tabs}} | ||
{{/metaFiles}} | ||
} | ||
import { getRouteMetaById } from './route-meta'; | ||
import { demoIndexes } from './demos'; | ||
import { filesFrontmatter } from './frontmatter'; | ||
|
||
// generate demos data in runtime, for reuse route.id to reduce bundle size | ||
export const demos = {}; | ||
|
||
/** @private Internal usage. Safe to refactor. */ | ||
export async function loadFilesMeta() { | ||
export async function loadFilesMeta(idList: string[]) { | ||
const metaMap: Record<string, any> = {}; | ||
const idList = [ | ||
{{#metaFiles}} | ||
'{{{id}}}', | ||
{{/metaFiles}} | ||
]; | ||
|
||
{{#metaFiles}} | ||
metaMap['{{{id}}}'] = import('{{{file}}}?type=meta'); | ||
if (idList.includes('{{{id}}}')) { | ||
metaMap['{{{id}}}'] = async () => { | ||
const routeMeta = await getRouteMetaById('{{{id}}}'); | ||
const demo = await demoIndexes['{{{id}}}']?.getter() || {}; | ||
return { | ||
frontmatter: filesFrontmatter['{{{id}}}'] ?? {}, | ||
toc: routeMeta?.toc ?? [], | ||
texts: routeMeta?.texts ?? [], | ||
tabs: routeMeta?.tabs ?? [], | ||
demos: demo?.demos ?? {}, | ||
}; | ||
}; | ||
} | ||
{{/metaFiles}} | ||
|
||
// Wait for all meta data to be loaded | ||
const metaList = await Promise.all(idList.map(id => metaMap[id])); | ||
const metaList = await Promise.all(Object.entries(metaMap).map(([id, getter]) => getter())); | ||
|
||
// Merge into filesMeta | ||
const filesMeta = {}; | ||
|
||
idList.forEach((id, index) => { | ||
const meta = metaList[index]; | ||
|
||
filesMeta[id] = { | ||
...meta, | ||
tabs: filesMetaTabs[id], | ||
}; | ||
Object.entries(metaMap).forEach(([id], index) => { | ||
filesMeta[id] = metaList[index]; | ||
}); | ||
|
||
return filesMeta; | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里为啥退回原来的方式了,route meta 和 route component 拆成不同 chunk 了么
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
发现用原来的就够了,还能复用同一个 chunk。引入 texts 就需要异步 import
type=text
,而 frontmatter 是在主 bundle 的,所以这里直接用原来的方式效率应该是最高的。There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里应该只有 text meta