Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: SSR withoutHTML模式下，包一层<div id="root">{app}</div> #11724

Merged
merged 22 commits into from
Oct 11, 2023
Merged

fix: SSR withoutHTML模式下，包一层<div id="root">{app}</div> #11724

Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
53f38f2
fix: dev环境构建SSR server.js时，环境判断错误导致输出的dev产物带上了hash
Oct 8, 2023
7f6d6d5
Update packages/preset-umi/src/features/ssr/webpack/webpack.ts
gwuhaolin Oct 8, 2023
5d004a1
fix: dev环境构建SSR server.js时，环境判断错误导致输出的dev产物带上了hash
Oct 8, 2023
3fc62cf
Merge branch 'umijs:master' into master
gwuhaolin Oct 9, 2023
5b0946a
feature: 支持自定义SSR构建目标，默认为node，可配置为webworker以支持运行在类似Cloudflare Workers的平台
Oct 9, 2023
7fe8bdc
feature: getManifest支持传入sourceDir表示SSR产物目录
Oct 9, 2023
542304a
feature: getManifest支持传入sourceDir表示SSR产物目录
Oct 9, 2023
335e6a6
fix: rendertoreadablestream is not a function
Oct 9, 2023
e7fb0c1
Revert "feature: 支持自定义SSR构建目标，默认为node，可配置为webworker以支持运行在类似Cloudflare…
Oct 9, 2023
64a9a42
fix: rendertoreadablestream is not a function
Oct 9, 2023
bfcd087
Update packages/server/src/ssr.ts
gwuhaolin Oct 10, 2023
d1a6e33
Update packages/server/src/ssr.ts
gwuhaolin Oct 10, 2023
e9ced7f
fix: 还原g_getAssets
Oct 10, 2023
a496ec7
Merge branch 'umijs:master' into master
gwuhaolin Oct 10, 2023
1ab01c4
fix: 被执行时才调用getManifest()，避免在入口立即调用getManifest()
Oct 10, 2023
af6b87f
fix: 被执行时才调用getManifest()，避免在入口立即调用getManifest()
Oct 10, 2023
aceacd1
fix: 被执行时才调用getManifest()，避免在入口立即调用getManifest()
Oct 10, 2023
0f9f649
Merge branch 'umijs:master' into master
gwuhaolin Oct 11, 2023
a55b708
feature: SSR模式下，多输出一份和index.html完全一致的*.html文件，用于ER场景
Oct 11, 2023
d572247
feature: SSR模式下，多输出一份和index.html完全一致的*.html文件，用于ER场景
Oct 11, 2023
ac8bf17
fix: SSR withoutHTML模式下，包一层<div id="root">{app}</div>
Oct 11, 2023
f5dfd89
Merge branch 'umijs:master' into master
gwuhaolin Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/renderer-react/src/server.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export async function getClientRootComponent(opts: {
</AppContext.Provider>
);
if (opts.withoutHTML) {
return app;
return <div id="root">{app}</div>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

建议更新接口的声明以防止后续留坑和造成混淆，参考：

interface CreateServerlessOptions {
  /** 注释 */
  withoutHTML;
  /** 注释 */
  sourceDir;
}

interface CreateOptions extends CreateServerlessOptions {
  // ...
}

之所以这么做必要是因为这次两个新 option 大部分人都不需要，场景特定，所以应该尽可能的分而治之，防止后续在留坑。

}
return (
<Html loaderData={opts.loaderData} manifest={opts.manifest}>
Expand Down
Loading