From f26517c1e07b6f8bd9a546e2afd42ba6d168c7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E5=A3=B0?= <artin@cat.ms>
Date: Thu, 28 Mar 2024 14:33:28 +0800
Subject: [PATCH 1/3] feat: skip bundle stats page when load js (#12246)

---
 .../src/features/devTool/devTool.ts           | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/preset-umi/src/features/devTool/devTool.ts b/packages/preset-umi/src/features/devTool/devTool.ts
index 1cab8ccf360e..ef3c503e7ab6 100644
--- a/packages/preset-umi/src/features/devTool/devTool.ts
+++ b/packages/preset-umi/src/features/devTool/devTool.ts
@@ -80,17 +80,21 @@ export default (api: IApi) => {
           }
         }
 
-        // bundle status
-        const isDone =
-          api.appData.bundleStatus.done &&
-          (enableVite ||
-            api.config.mfsu === false ||
-            api.appData.mfsuBundleStatus.done);
-
-        if (!isDone) {
-          res.setHeader('Content-Type', 'text/html');
-          res.send(loadingHtml);
-          return;
+        if (
+          req.headers.accept?.includes('text/html') ||
+          req.headers.accept === '*/*'
+        ) {
+          // bundle status
+          const isDone =
+            api.appData.bundleStatus.done &&
+            (enableVite ||
+              api.config.mfsu === false ||
+              api.appData.mfsuBundleStatus.done);
+          if (!isDone) {
+            res.setHeader('Content-Type', 'text/html');
+            res.send(loadingHtml);
+            return;
+          }
         }
 
         return next();

From ac85e529d4a701b79f4e669cf337a506adc9ebd2 Mon Sep 17 00:00:00 2001
From: Jinbao1001 <nodewebli@gmail.com>
Date: Fri, 29 Mar 2024 10:53:41 +0800
Subject: [PATCH 2/3] release: 4.1.6

---
 lerna.json                             | 2 +-
 packages/ast/package.json              | 2 +-
 packages/babel-preset-umi/package.json | 2 +-
 packages/bundler-esbuild/package.json  | 2 +-
 packages/bundler-utils/package.json    | 2 +-
 packages/bundler-vite/package.json     | 2 +-
 packages/bundler-webpack/package.json  | 2 +-
 packages/core/package.json             | 2 +-
 packages/create-umi/package.json       | 2 +-
 packages/lint/package.json             | 2 +-
 packages/max/package.json              | 2 +-
 packages/mfsu/package.json             | 2 +-
 packages/plugin-docs/package.json      | 2 +-
 packages/plugin-run/package.json       | 2 +-
 packages/plugins/package.json          | 2 +-
 packages/preset-umi/package.json       | 2 +-
 packages/preset-vue/package.json       | 2 +-
 packages/renderer-react/package.json   | 2 +-
 packages/renderer-vue/package.json     | 2 +-
 packages/server/package.json           | 2 +-
 packages/testing/package.json          | 2 +-
 packages/umi/package.json              | 2 +-
 packages/utils/package.json            | 2 +-
 packages/zod2ts/package.json           | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 413192b4544f..2603ee0ac2c9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,4 +1,4 @@
 {
-  "version": "4.1.5",
+  "version": "4.1.6",
   "workspaces": ["packages/*"]
 }
diff --git a/packages/ast/package.json b/packages/ast/package.json
index 06b26c01dca9..fb9b77c2cc6c 100644
--- a/packages/ast/package.json
+++ b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/ast",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/ast",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/ast#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/babel-preset-umi/package.json b/packages/babel-preset-umi/package.json
index 9145965d3079..cdfa945d5691 100644
--- a/packages/babel-preset-umi/package.json
+++ b/packages/babel-preset-umi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/babel-preset-umi",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "Official babel preset for umi.",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/babel-preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/bundler-esbuild/package.json b/packages/bundler-esbuild/package.json
index 4507ce668213..7094302068d1 100644
--- a/packages/bundler-esbuild/package.json
+++ b/packages/bundler-esbuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-esbuild",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/bundler-esbuild",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-esbuild#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/bundler-utils/package.json b/packages/bundler-utils/package.json
index 1d22261cdb78..8b44c523e978 100644
--- a/packages/bundler-utils/package.json
+++ b/packages/bundler-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utils",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-utils#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
diff --git a/packages/bundler-vite/package.json b/packages/bundler-vite/package.json
index 9c218ab62f4f..2f12959ae8ba 100644
--- a/packages/bundler-vite/package.json
+++ b/packages/bundler-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-vite",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/bundler-vite",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-vite#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/bundler-webpack/package.json b/packages/bundler-webpack/package.json
index b25263e1f47c..19ebe83968dc 100644
--- a/packages/bundler-webpack/package.json
+++ b/packages/bundler-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/core/package.json b/packages/core/package.json
index 8946ddc631ca..db9ea2e45868 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
diff --git a/packages/create-umi/package.json b/packages/create-umi/package.json
index e527914f6759..b37f848856cd 100644
--- a/packages/create-umi/package.json
+++ b/packages/create-umi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-umi",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "create-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/create-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/lint/package.json b/packages/lint/package.json
index e8acc26f1c0a..2a6fd489ebbb 100644
--- a/packages/lint/package.json
+++ b/packages/lint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/lint",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/lint",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/lint#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/max/package.json b/packages/max/package.json
index 70e6ef0eec16..47d78a5d1f64 100644
--- a/packages/max/package.json
+++ b/packages/max/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/max",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/max",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/max#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/mfsu/package.json b/packages/mfsu/package.json
index 2b9fcf370ae1..d097516876d0 100644
--- a/packages/mfsu/package.json
+++ b/packages/mfsu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/plugin-docs/package.json b/packages/plugin-docs/package.json
index f11c3b1d35d4..62c554b1da43 100644
--- a/packages/plugin-docs/package.json
+++ b/packages/plugin-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugin-docs",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/plugin-docs",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugin-docs#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/plugin-run/package.json b/packages/plugin-run/package.json
index b195c5392aea..cbd99f741866 100644
--- a/packages/plugin-run/package.json
+++ b/packages/plugin-run/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugin-run",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/plugin-run",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugin-run#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index 4ae60e0973b7..23253c88c229 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/preset-umi/package.json b/packages/preset-umi/package.json
index 30f3f9c160b2..5bdfd4372f46 100644
--- a/packages/preset-umi/package.json
+++ b/packages/preset-umi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/preset-vue/package.json b/packages/preset-vue/package.json
index 65afa13e3764..152372605dbb 100644
--- a/packages/preset-vue/package.json
+++ b/packages/preset-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-vue",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/preset-vue",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-vue#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/renderer-react/package.json b/packages/renderer-react/package.json
index 07ceab9a5daa..a85d03a940ec 100644
--- a/packages/renderer-react/package.json
+++ b/packages/renderer-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/renderer-vue/package.json b/packages/renderer-vue/package.json
index b11d79d1e1f8..0263ac0606d9 100644
--- a/packages/renderer-vue/package.json
+++ b/packages/renderer-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-vue",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/renderer-vue",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-vue#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/server/package.json b/packages/server/package.json
index a3649c6748cd..db99e161d88b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/server",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/server#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/testing/package.json b/packages/testing/package.json
index 53f2a6bbcbb2..dbda7fd0b9c3 100644
--- a/packages/testing/package.json
+++ b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/test",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/test",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/testing#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/umi/package.json b/packages/umi/package.json
index 5f744107293d..29de652f26c8 100644
--- a/packages/umi/package.json
+++ b/packages/umi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umi",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 2c86ea6c4c33..345b6ffa639d 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/utils",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/utils#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
diff --git a/packages/zod2ts/package.json b/packages/zod2ts/package.json
index 60f9573e76a1..b718ab459a42 100644
--- a/packages/zod2ts/package.json
+++ b/packages/zod2ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umijs/zod2ts",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "@umijs/zod2ts",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/zod2ts#readme",
   "bugs": "https://github.com/umijs/umi/issues",

From ae9dc254306b6cedec336f6a0b8faf5a44bae026 Mon Sep 17 00:00:00 2001
From: MadCcc <1075746765@qq.com>
Date: Mon, 1 Apr 2024 14:24:08 +0800
Subject: [PATCH 3/3] feat: SSR support useServerInsertedHTML (#12247)

* feat: SSR support useServerInsertedHTML

* feat: ssr insert html

* fix: string template

* chore: update lock
---
 examples/ssr-demo/package.json                |   2 +
 examples/ssr-demo/src/layouts/index.tsx       |  23 ++++
 examples/ssr-demo/src/pages/index.tsx         |  14 ++-
 .../routePreloadOnLoad/routePreloadOnLoad.ts  |   2 +-
 packages/server/src/ssr.ts                    | 106 +++++++++++++-----
 pnpm-lock.yaml                                |  38 ++++---
 6 files changed, 137 insertions(+), 48 deletions(-)
 create mode 100644 examples/ssr-demo/src/layouts/index.tsx

diff --git a/examples/ssr-demo/package.json b/examples/ssr-demo/package.json
index 564ea9a69734..3b81a184639b 100644
--- a/examples/ssr-demo/package.json
+++ b/examples/ssr-demo/package.json
@@ -9,6 +9,8 @@
     "start:prod": "node ./production-server.js"
   },
   "dependencies": {
+    "@ant-design/cssinjs": "^1.18.5",
+    "antd": "^5",
     "express": "4.18.2",
     "umi": "workspace:*"
   }
diff --git a/examples/ssr-demo/src/layouts/index.tsx b/examples/ssr-demo/src/layouts/index.tsx
new file mode 100644
index 000000000000..06c6f7ea086c
--- /dev/null
+++ b/examples/ssr-demo/src/layouts/index.tsx
@@ -0,0 +1,23 @@
+import { createCache, extractStyle, StyleProvider } from '@ant-design/cssinjs';
+import { useState } from 'react';
+import { Outlet, useServerInsertedHTML } from 'umi';
+
+export default function Layout() {
+  const [cssCache] = useState(() => createCache());
+
+  useServerInsertedHTML(() => {
+    const style = extractStyle(cssCache, { plain: true });
+    return (
+      <style
+        id="antd-cssinjs"
+        dangerouslySetInnerHTML={{ __html: style }}
+      ></style>
+    );
+  });
+
+  return (
+    <StyleProvider cache={cssCache}>
+      <Outlet />
+    </StyleProvider>
+  );
+}
diff --git a/examples/ssr-demo/src/pages/index.tsx b/examples/ssr-demo/src/pages/index.tsx
index 279b00b9d5c1..c12ea05b1ed6 100644
--- a/examples/ssr-demo/src/pages/index.tsx
+++ b/examples/ssr-demo/src/pages/index.tsx
@@ -1,3 +1,5 @@
+import { Input } from 'antd';
+import { useId } from 'react';
 import {
   Link,
   MetadataLoader,
@@ -22,16 +24,26 @@ export default function HomePage() {
   const serverLoaderData = useServerLoaderData<typeof serverLoader>();
 
   useServerInsertedHTML(() => {
-    return <div>inserted html</div>;
+    return (
+      <style
+        dangerouslySetInnerHTML={{
+          __html: `.server_inserted_style { color: #1677ff }`,
+        }}
+      ></style>
+    );
   });
 
+  const id = useId();
+
   return (
     <div>
       <h1 className="title">Hello~</h1>
+      <p className="server_inserted_style">id: {id}</p>
       <p className={styles.blue}>This is index.tsx</p>
       <p className={cssStyle.title}>I should be pink</p>
       <p className={cssStyle.blue}>I should be cyan</p>
       <Button />
+      <Input placeholder="这个样式不应该闪烁" />
       <img src={bigImage} alt="" />
       <img src={umiLogo} alt="umi" />
       <Link to="/users/user">/users/user</Link>
diff --git a/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts b/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts
index a42eebe7ffce..04d623b3570f 100644
--- a/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts
+++ b/packages/preset-umi/src/features/routePreloadOnLoad/routePreloadOnLoad.ts
@@ -256,7 +256,7 @@ export default (api: IApi) => {
               },
             ];
       }
-  
+
       return [];
     },
     stage: Infinity,
diff --git a/packages/server/src/ssr.ts b/packages/server/src/ssr.ts
index d25f0c7ceb30..bdc65802dfef 100644
--- a/packages/server/src/ssr.ts
+++ b/packages/server/src/ssr.ts
@@ -50,10 +50,9 @@ interface IExecMetaLoaderOpts extends IExecLoaderOpts {
   serverLoaderData?: any;
 }
 
-const createJSXProvider = (
-  Provider: any,
-  serverInsertedHTMLCallbacks: Set<() => React.ReactNode>,
-) => {
+const createJSXProvider = (Provider: any) => {
+  const serverInsertedHTMLCallbacks: Set<() => React.ReactNode> = new Set();
+
   const JSXProvider = (props: any) => {
     const addInsertedHtml = React.useCallback(
       (handler: () => React.ReactNode) => {
@@ -67,7 +66,7 @@ const createJSXProvider = (
       value: addInsertedHtml,
     });
   };
-  return JSXProvider;
+  return [JSXProvider, serverInsertedHTMLCallbacks] as const;
 };
 
 function createJSXGenerator(opts: CreateRequestHandlerOptions) {
@@ -163,16 +162,27 @@ function createJSXGenerator(opts: CreateRequestHandlerOptions) {
   };
 }
 
+const SERVER_INSERTED_HTML = 'umi-server-inserted-html';
 const getGenerateStaticHTML = (
-  serverInsertedHTMLCallbacks?: Set<() => React.ReactNode>,
+  serverInsertedHTMLCallbacks: Set<() => React.ReactNode>,
+  opts?: {
+    wrapper?: boolean;
+  },
 ) => {
+  const children = React.createElement(React.Fragment, {
+    children: Array.from(serverInsertedHTMLCallbacks || []).map((callback) =>
+      callback(),
+    ),
+  });
   return (
     ReactDomServer.renderToString(
-      React.createElement(React.Fragment, {
-        children: Array.from(serverInsertedHTMLCallbacks || []).map(
-          (callback) => callback(),
-        ),
-      }),
+      opts?.wrapper
+        ? React.createElement(
+            'div',
+            { id: SERVER_INSERTED_HTML, hidden: true },
+            children,
+          )
+        : children,
     ) || ''
   );
 };
@@ -184,11 +194,8 @@ export function createMarkupGenerator(opts: CreateRequestHandlerOptions) {
     const jsx = await jsxGeneratorDeferrer(url);
     if (jsx) {
       return new Promise(async (resolve, reject) => {
-        const serverInsertedHTMLCallbacks: Set<() => React.ReactNode> =
-          new Set();
-        const JSXProvider = createJSXProvider(
+        const [JSXProvider, serverInsertedHTMLCallbacks] = createJSXProvider(
           opts.ServerInsertedHTMLContext.Provider,
-          serverInsertedHTMLCallbacks,
         );
 
         let chunks: Buffer[] = [];
@@ -200,7 +207,10 @@ export function createMarkupGenerator(opts: CreateRequestHandlerOptions) {
         };
         writable.on('finish', async () => {
           let html = Buffer.concat(chunks).toString('utf8');
-          html += await getGenerateStaticHTML(serverInsertedHTMLCallbacks);
+          const serverHTML = getGenerateStaticHTML(serverInsertedHTMLCallbacks);
+          if (serverHTML) {
+            html = html.replace(/<\/head>/, `${serverHTML}</head>`);
+          }
           // append helmet tags to head
           if (opts.helmetContext) {
             html = html.replace(
@@ -266,9 +276,11 @@ export default function createRequestHandler(
       otherwise(): Promise<void> | void;
     };
 
+    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 (typeof FetchEvent !== 'undefined' && args[0] instanceof FetchEvent) {
       // worker mode
-      const [ev, opts] = args as IWorkerRequestHandlerArgs;
+      const [ev, workerOpts] = args as IWorkerRequestHandlerArgs;
       const { pathname, searchParams } = new URL(ev.request.url);
 
       ret = {
@@ -290,16 +302,19 @@ export default function createRequestHandler(
           });
 
           // allow modify response
-          if (opts?.modifyResponse) {
-            res = await opts.modifyResponse(res);
+          if (workerOpts?.modifyResponse) {
+            res = await workerOpts.modifyResponse(res);
           }
 
           ev.respondWith(res);
         },
         async sendPage(jsx) {
+          const [JSXProvider, serverInsertedHTMLCallbacks] = createJSXProvider(
+            opts.ServerInsertedHTMLContext.Provider,
+          );
           // handle route path request
           const stream = await ReactDomServer.renderToReadableStream(
-            jsx.element,
+            React.createElement(JSXProvider, undefined, jsx.element),
             {
               bootstrapScripts: [jsx.manifest.assets['umi.js'] || '/umi.js'],
               onError(x: any) {
@@ -307,6 +322,22 @@ export default function createRequestHandler(
               },
             },
           );
+
+          const transformStream = new TransformStream({
+            flush(controller) {
+              if (serverInsertedHTMLCallbacks.size) {
+                const serverHTML = getGenerateStaticHTML(
+                  serverInsertedHTMLCallbacks,
+                  { wrapper: true },
+                );
+                controller.enqueue(serverHTML);
+                controller.enqueue(replaceServerHTMLScript);
+              }
+            },
+          });
+
+          stream.pipeThrough(transformStream);
+
           let res = new Response(stream, {
             headers: {
               'content-type': 'text/html; charset=utf-8',
@@ -315,8 +346,8 @@ export default function createRequestHandler(
           });
 
           // allow modify response
-          if (opts?.modifyResponse) {
-            res = await opts.modifyResponse(res);
+          if (workerOpts?.modifyResponse) {
+            res = await workerOpts.modifyResponse(res);
           }
 
           ev.respondWith(res);
@@ -343,6 +374,9 @@ export default function createRequestHandler(
           res.status(200).json(data);
         },
         async sendPage(jsx) {
+          const [JSXProvider, serverInsertedHTMLCallbacks] = createJSXProvider(
+            opts.ServerInsertedHTMLContext.Provider,
+          );
           const writable = new Writable();
 
           res.type('html');
@@ -353,19 +387,29 @@ export default function createRequestHandler(
           };
 
           writable.on('finish', async () => {
-            res.write(getGenerateStaticHTML());
+            if (serverInsertedHTMLCallbacks.size) {
+              res.write(
+                getGenerateStaticHTML(serverInsertedHTMLCallbacks, {
+                  wrapper: true,
+                }),
+              );
+              res.write(replaceServerHTMLScript);
+            }
             res.end();
           });
 
-          const stream = ReactDomServer.renderToPipeableStream(jsx.element, {
-            bootstrapScripts: [jsx.manifest.assets['umi.js'] || '/umi.js'],
-            onShellReady() {
-              stream.pipe(writable);
-            },
-            onError(x: any) {
-              console.error(x);
+          const stream = ReactDomServer.renderToPipeableStream(
+            React.createElement(JSXProvider, undefined, jsx.element),
+            {
+              bootstrapScripts: [jsx.manifest.assets['umi.js'] || '/umi.js'],
+              onShellReady() {
+                stream.pipe(writable);
+              },
+              onError(x: any) {
+                console.error(x);
+              },
             },
-          });
+          );
         },
         otherwise: next,
       };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1b0fde386c80..37e6c9e372ee 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1123,6 +1123,12 @@ importers:
 
   examples/ssr-demo:
     dependencies:
+      '@ant-design/cssinjs':
+        specifier: ^1.18.5
+        version: 1.18.5(react-dom@18.1.0)(react@18.1.0)
+      antd:
+        specifier: ^5
+        version: 5.8.4(react-dom@18.1.0)(react@18.1.0)
       express:
         specifier: 4.18.2
         version: 4.18.2
@@ -3112,8 +3118,8 @@ packages:
       stylis: 4.1.4
     dev: false
 
-  /@ant-design/cssinjs@1.17.0(react-dom@18.1.0)(react@18.1.0):
-    resolution: {integrity: sha512-MgGCZ6sfD3yQB0XW0hN4jgixMxApTlDYyct+pc7fRZNO4CaqWWm/9iXkkljNR27lyWLZmm+XiDfcIOo1bnrnMA==}
+  /@ant-design/cssinjs@1.18.5(react-dom@17.0.2)(react@17.0.2):
+    resolution: {integrity: sha512-Ub4n3d+MAX/qtE5S9PM8iOn5ocU7GUAIC4Adc2X8UCMXnsRRfpJBHsBdtQ1qoAuaQ7lU2M1BTCuJ+fkv4fOWiw==}
     peerDependencies:
       react: '>=16.0.0'
       react-dom: '>=16.0.0'
@@ -3128,14 +3134,14 @@ packages:
       '@emotion/unitless': 0.7.5
       classnames: 2.3.2
       csstype: 3.1.3
-      rc-util: 5.38.1(react-dom@18.1.0)(react@18.1.0)
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      rc-util: 5.38.1(react-dom@17.0.2)(react@17.0.2)
+      react: 17.0.2
+      react-dom: 17.0.2(react@17.0.2)
       stylis: 4.3.0
     dev: true
 
-  /@ant-design/cssinjs@1.18.1(react-dom@17.0.2)(react@17.0.2):
-    resolution: {integrity: sha512-1JURAPrsjK1GwpqByTq3bJ7nF7lbMKDZpehqeR2n8/IR5O58/W1U4VcOeaw5ZyTHri3tEMcom7dyP2tvxpW54g==}
+  /@ant-design/cssinjs@1.18.5(react-dom@18.1.0)(react@18.1.0):
+    resolution: {integrity: sha512-Ub4n3d+MAX/qtE5S9PM8iOn5ocU7GUAIC4Adc2X8UCMXnsRRfpJBHsBdtQ1qoAuaQ7lU2M1BTCuJ+fkv4fOWiw==}
     peerDependencies:
       react: '>=16.0.0'
       react-dom: '>=16.0.0'
@@ -3149,12 +3155,11 @@ packages:
       '@emotion/hash': 0.8.0
       '@emotion/unitless': 0.7.5
       classnames: 2.3.2
-      csstype: 3.1.2
-      rc-util: 5.38.1(react-dom@17.0.2)(react@17.0.2)
-      react: 17.0.2
-      react-dom: 17.0.2(react@17.0.2)
+      csstype: 3.1.3
+      rc-util: 5.38.1(react-dom@18.1.0)(react@18.1.0)
+      react: 18.1.0
+      react-dom: 18.1.0(react@18.1.0)
       stylis: 4.3.0
-    dev: true
 
   /@ant-design/cssinjs@1.9.1(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-CZt1vCMs/sY7RoacYuIkZwQmb8Bhp99ReNNE9Y8lnUzik8fmCdKAQA7ecvVOFwmNFdcBHga7ye/XIRrsbkiqWw==}
@@ -17648,7 +17653,7 @@ packages:
     dependencies:
       '@ahooksjs/use-request': 2.8.15(react@17.0.2)
       '@ant-design/antd-theme-variable': 1.0.0
-      '@ant-design/cssinjs': 1.18.1(react-dom@17.0.2)(react@17.0.2)
+      '@ant-design/cssinjs': 1.18.5(react-dom@17.0.2)(react@17.0.2)
       '@ant-design/icons': 4.7.0(react-dom@17.0.2)(react@17.0.2)
       '@ant-design/moment-webpack-plugin': 0.0.3
       '@ant-design/pro-components': 2.3.20(antd@4.23.6)(react-dom@17.0.2)(react@17.0.2)
@@ -19548,7 +19553,7 @@ packages:
         optional: true
     dependencies:
       '@ant-design/colors': 7.0.0
-      '@ant-design/cssinjs': 1.17.0(react-dom@18.1.0)(react@18.1.0)
+      '@ant-design/cssinjs': 1.18.5(react-dom@18.1.0)(react@18.1.0)
       '@ant-design/icons': 5.0.1(react-dom@18.1.0)(react@18.1.0)
       '@ant-design/react-slick': 1.0.0(react@18.1.0)
       '@babel/runtime': 7.21.0
@@ -19747,7 +19752,7 @@ packages:
         optional: true
     dependencies:
       '@ant-design/colors': 7.0.0
-      '@ant-design/cssinjs': 1.16.0(react-dom@18.1.0)(react@18.1.0)
+      '@ant-design/cssinjs': 1.18.5(react-dom@18.1.0)(react@18.1.0)
       '@ant-design/icons': 5.2.5(react-dom@18.1.0)(react@18.1.0)
       '@ant-design/react-slick': 1.0.0(react@18.1.0)
       '@babel/runtime': 7.21.0
@@ -22496,6 +22501,7 @@ packages:
     dependencies:
       loose-envify: 1.4.0
       object-assign: 4.1.1
+    bundledDependencies: false
 
   /create-require@1.1.1:
     resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
@@ -40724,6 +40730,7 @@ packages:
       react: 16.14.0
       scheduler: 0.19.1
     dev: false
+    bundledDependencies: false
 
   /react-dom@17.0.2(react@17.0.2):
     resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==}
@@ -41371,6 +41378,7 @@ packages:
       object-assign: 4.1.1
       prop-types: 15.8.1
     dev: false
+    bundledDependencies: false
 
   /react@17.0.2:
     resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}