From 5d2cbbc3a3e2d706461e4a6f903f4d48102e14d4 Mon Sep 17 00:00:00 2001
From: PeachScript <scdzwyxst@gmail.com>
Date: Sun, 7 Apr 2024 16:06:29 +0800
Subject: [PATCH] refactor: correct logic

---
 packages/preset-umi/src/features/ssr/ssr.ts | 28 +++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/preset-umi/src/features/ssr/ssr.ts b/packages/preset-umi/src/features/ssr/ssr.ts
index 83f4a0ecb993..59def10b65a9 100644
--- a/packages/preset-umi/src/features/ssr/ssr.ts
+++ b/packages/preset-umi/src/features/ssr/ssr.ts
@@ -17,6 +17,7 @@ export default (api: IApi) => {
   const webpackBuilder: typeof import('./webpack/webpack') = importLazy(
     require.resolve('./webpack/webpack'),
   );
+  let serverBuildTarget: string;
 
   api.describe({
     key: 'ssr',
@@ -50,23 +51,36 @@ export default (api: IApi) => {
     logger.warn(`SSR feature is in beta, may be unstable`);
   });
 
-  api.modifyConfig((memo) => {
-    // define SSR_BUILD_TARGET to strip useless logic
-    memo.define ??= {};
-    memo.define.SSR_BUILD_TARGET =
-      api.config.ssr.serverBuildTarget || 'express';
+  api.modifyDefaultConfig((memo) => {
+    if (serverBuildTarget === 'worker') {
+      const oReactDom = memo.alias['react-dom'];
+
+      // put react-dom after react-dom/server
+      delete memo.alias['react-dom'];
 
-    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(
-        join(memo.alias['react-dom'], 'server.browser.js'),
+        join(
+          api.service.configDefaults.alias['react-dom'],
+          'server.browser.js',
+        ),
       );
+      memo.alias['react-dom'] = oReactDom;
     }
 
     return memo;
   });
 
+  api.modifyConfig((memo) => {
+    // define SSR_BUILD_TARGET to strip useless logic
+    memo.define ??= {};
+    serverBuildTarget = memo.define['process.env.SSR_BUILD_TARGET'] =
+      memo.ssr.serverBuildTarget || 'express';
+
+    return memo;
+  });
+
   api.addMiddlewares(() => [
     async (req, res, next) => {
       const modulePath = absServerBuildPath(api);