Skip to content

Commit

Permalink
refactor: rename config
Browse files Browse the repository at this point in the history
  • Loading branch information
PeachScript committed Apr 7, 2024
1 parent 0c2fc10 commit 7a56401
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions packages/preset-umi/src/features/ssr/ssr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default (api: IApi) => {
return zod
.object({
serverBuildPath: zod.string(),
serverBuildMode: zod.enum(['express', 'worker']),
serverBuildTarget: zod.enum(['express', 'worker']),
platform: zod.string(),
builder: zod.enum(['esbuild', 'webpack']),
renderFromRoot: zod.boolean(),
Expand All @@ -51,11 +51,12 @@ export default (api: IApi) => {
});

api.modifyConfig((memo) => {
// define SSR_BUILD_MODE to strip useless logic
// define SSR_BUILD_TARGET to strip useless logic
memo.define ??= {};
memo.define.SSR_BUILD_MODE = api.config.ssr.serverBuildMode || 'express';
memo.define.SSR_BUILD_TARGET =
api.config.ssr.serverBuildTarget || 'express';

if (api.config.serverBuildMode === 'worker') {
if (api.config.serverBuildTarget === 'worker') {
// use browser version of react-dom/server for worker mode
// ref: https://github.com/facebook/react/blob/f86afca090b668d8be10b642750844759768d1ad/packages/react-server-dom-webpack/package.json#L52
memo.alias['react-dom/server$'] = winPath(
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/ssr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ export default function createRequestHandler(

const replaceServerHTMLScript = `<script>!function(){var e=document.getElementById("${SERVER_INSERTED_HTML}");e&&(Array.from(e.children).forEach(e=>{document.head.appendChild(e)}),e.remove())}();</script>`;

if (process.env.SSR_BUILD_MODE === 'worker') {
if (process.env.SSR_BUILD_TARGET === 'worker') {
// worker mode
const [ev, workerOpts] = args as IWorkerRequestHandlerArgs;
const { pathname, searchParams } = new URL(ev.request.url);
Expand Down

0 comments on commit 7a56401

Please sign in to comment.