ssr-plugin-react 6.2.85 → 7.0.1-beta.0

package/esm/entry/react18-client-entry.js

@@ -0,0 +1,59 @@
+//@ts-ignore
+import { hydrateRoot, createRoot } from 'react-dom/client';
+import { createElement } from 'react';
+import { BrowserRouter, Route, Switch } from 'react-router-dom';
+import { preloadComponent, isMicro, setStoreContext, setStore } from 'ssr-common-utils';
+import { wrapComponent } from 'ssr-hoc-react';
+import { ssrCreateContext, Routes, createStore } from './create';
+import { AppContext } from './context';
+const { FeRoutes, layoutFetch, App } = Routes;
+const clientRender = async () => {
+    var _a, _b, _c;
+    const IApp = App !== null && App !== void 0 ? App : function (props) {
+        return props.children;
+    };
+    const context = ssrCreateContext();
+    setStoreContext(context);
+    const store = createStore(window.__VALTIO_DATA__);
+    setStore(store !== null && store !== void 0 ? store : {});
+    const baseName = isMicro() ? window.clientPrefix : window.prefix;
+    const routes = await preloadComponent(FeRoutes, baseName);
+    const container = document.querySelector((_a = window.ssrDevInfo.rootId) !== null && _a !== void 0 ? _a : '#app');
+    const ele = createElement(
+    //@ts-ignore
+    BrowserRouter, {
+        basename: baseName
+    }, createElement(AppContext, {
+        context,
+        children: createElement(Switch, null, createElement(IApp, null, createElement(Switch, null, routes.map((item) => {
+            const { fetch, component, path } = item;
+            component.fetch = fetch;
+            component.layoutFetch = layoutFetch;
+            const WrappedComponent = wrapComponent(component);
+            return createElement(Route, {
+                exact: true,
+                key: path,
+                path: path,
+                render: (props) => createElement(WrappedComponent, {
+                    ...props,
+                    key: props.history.location.key
+                })
+            });
+        }))))
+    }));
+    if (window.__USE_SSR__) {
+        ;
+        hydrateRoot(container, ele);
+    }
+    else {
+        const root = createRoot(container);
+        root.render(ele);
+    }
+    if (!window.__USE_VITE__) {
+        ;
+        (_c = (_b = module === null || module === void 0 ? void 0 : module.hot) === null || _b === void 0 ? void 0 : _b.accept) === null || _c === void 0 ? void 0 : _c.call(_b);
+    }
+};
+clientRender();
+export { clientRender };
+//# sourceMappingURL=react18-client-entry.js.map

package/esm/entry/react18-client-entry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"react18-client-entry.js","sourceRoot":"","sources":["../../src/entry/react18-client-entry.tsx"],"names":[],"mappings":"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"}

package/esm/entry/server-entry.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ISSRContext, IConfig } from 'ssr-types';
 import { Routes } from './create';
 declare const serverRender: (ctx: ISSRContext, config: IConfig) => Promise<string | import("stream").Readable | NodeJS.ReadableStream | import("ssr-types").PipeableStream | {

package/esm/entry/server-entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-entry.d.ts","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAmD,MAAM,WAAW,CAAA;AAGjG,OAAO,EAAE,MAAM,EAAiC,MAAM,UAAU,CAAA;AAIhE,QAAA,MAAM,YAAY,QAAe,WAAW,UAAU,OAAO;;;EA4H5D,CAAA;AAED,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAA"}
+{"version":3,"file":"server-entry.d.ts","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAmD,MAAM,WAAW,CAAA;AAGjG,OAAO,EAAE,MAAM,EAAiC,MAAM,UAAU,CAAA;AAOhE,QAAA,MAAM,YAAY,GAAU,KAAK,WAAW,EAAE,QAAQ,OAAO;;;EAuI5D,CAAA;AAED,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAA"}

package/esm/entry/server-entry.js

@@ -1,9 +1,9 @@
 import { PassThrough } from 'stream';
 import * as React from 'react';
 import { createElement } from 'react';
+import * as ReactDOMServer from 'react-dom/server';
 import { StaticRouter } from 'react-router-dom';
-import { renderToString, renderToNodeStream } from 'react-dom/server';
-import { findRoute, getManifest, logGreen, normalizePath, getAsyncCssChunk, getAsyncJsChunk, splitPageInfo, reactRefreshFragment, localStorageWrapper, checkRoute, useStore } from 'ssr-common-utils';
+import { findRoute, getManifest, logGreen, normalizePath, getAsyncCssChunk, getAsyncJsChunk, splitPageInfo, reactRefreshFragment, localStorageWrapper, checkRoute, useStore, isReact18, getClientEntry } from 'ssr-common-utils';
 import { serialize } from 'ssr-serialize-javascript';
 import { AppContext } from './context';
 import { Routes, ssrCreateContext, createStore } from './create';
@@ -11,7 +11,7 @@ const { FeRoutes, layoutFetch, state, Layout } = Routes;
 const serverRender = async (ctx, config) => {
     var _a;
     const context = ssrCreateContext();
-    const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix, stream, rootId, hashRouter, streamHighWaterMark } = config;
+    const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix, onReady, onError, stream, rootId, hashRouter, streamHighWaterMark } = config;
     const rawPath = (_a = ctx.request.path) !== null && _a !== void 0 ? _a : ctx.request.url;
     const path = normalizePath(rawPath, prefix);
     const routeItem = findRoute(FeRoutes, path);
@@ -46,7 +46,7 @@ const serverRender = async (ctx, config) => {
                         } })
                 ]
                 : []),
-            ...(isVite && isDev ? [React.createElement("script", { type: "module", src: "/node_modules/ssr-plugin-react/esm/entry/client-entry.js", key: "vite-react-entry" })] : []),
+            ...(isVite && isDev ? [React.createElement("script", { type: "module", src: `/node_modules/ssr-plugin-react/esm/entry/${getClientEntry()}.js`, key: "vite-react-entry" })] : []),
             ...dynamicJsOrder
                 .map((js) => manifest[js])
                 .filter(Boolean)
@@ -96,7 +96,19 @@ const serverRender = async (ctx, config) => {
             }, createElement(Component, null))
         }));
         // for ctx.body will loose asynclocalstorage context, consume stream in advance like vue2/3
-        return stream ? renderToNodeStream(ele).pipe(new PassThrough({ highWaterMark: streamHighWaterMark })) : renderToString(ele);
+        if (isReact18()) {
+            return stream
+                ? ReactDOMServer
+                    .renderToPipeableStream(ele, {
+                    onAllReady: onReady,
+                    onError: onError
+                })
+                    .pipe(new PassThrough({ highWaterMark: streamHighWaterMark }))
+                : ReactDOMServer.renderToString(ele);
+        }
+        else {
+            return stream ? ReactDOMServer.renderToNodeStream(ele).pipe(new PassThrough({ highWaterMark: streamHighWaterMark })) : ReactDOMServer.renderToString(ele);
+        }
     };
     return await localStorageWrapper.run({
         context: context,

package/esm/entry/server-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-entry.js","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-entry.js","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":"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"}

package/esm/index.d.ts

@@ -3,5 +3,4 @@ export declare function clientPlugin(): {
     start: () => Promise<void>;
     build: () => Promise<void>;
 };
-export * from './tools/vite';
 //# sourceMappingURL=index.d.ts.map

package/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,wBAAgB,YAAY;;;;EAyC3B;AAED,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,wBAAgB,YAAY;;;;EAsC3B"}

package/esm/index.js

@@ -1,51 +1,46 @@
-import { loadConfig } from 'ssr-common-utils';
+import { resolve } from 'path';
+import { loadConfig, getCwd } from 'ssr-common-utils';
 const { isVite, optimize } = loadConfig();
 const spinner = require('ora')('Building');
 export function clientPlugin() {
+    const cwd = getCwd();
+    const webpackPath = resolve(cwd, './node_modules/ssr-webpack');
+    const vitePath = resolve(cwd, './node_modules/ssr-vite');
     return {
         name: 'plugin-react',
         start: async () => {
             if (isVite) {
-                const { viteStart } = await import('./tools/vite');
-                await viteStart();
+                const { start } = await import(vitePath);
+                await start();
             }
             else {
                 if (optimize) {
                     spinner.start();
-                    const { viteBuildClient } = await import('./tools/vite');
+                    const { viteBuildClient } = await import(vitePath);
                     await viteBuildClient();
                     process.env.NODE_ENV = 'development';
                     spinner.stop();
-                    const { webpackStart } = await import('./tools/webpack');
-                    await webpackStart();
-                }
-                else {
-                    const { webpackStart } = await import('./tools/webpack');
-                    await webpackStart();
                 }
+                const { start } = await import(webpackPath);
+                await start();
             }
         },
         build: async () => {
             if (isVite) {
-                const { viteBuild } = await import('./tools/vite');
-                await viteBuild();
+                const { build } = await import(vitePath);
+                await build();
             }
             else {
                 if (optimize) {
                     spinner.start();
-                    const { viteBuildClient } = await import('./tools/vite');
-                    await viteBuildClient();
+                    const { build } = await import(vitePath);
+                    await build();
                     spinner.stop();
-                    const { webpackBuild } = await import('./tools/webpack');
-                    await webpackBuild();
-                }
-                else {
-                    const { webpackBuild } = await import('./tools/webpack');
-                    await webpackBuild();
                 }
+                const { build } = await import(webpackPath);
+                await build();
             }
         }
     };
 }
-export * from './tools/vite';
 //# sourceMappingURL=index.js.map

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,CAAA;AACzC,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAA;AAE1C,MAAM,UAAU,YAAY;IAC3B,OAAO;QACN,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,KAAK,IAAI,EAAE;YACjB,IAAI,MAAM,EAAE;gBACX,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAA;gBAClD,MAAM,SAAS,EAAE,CAAA;aACjB;iBAAM;gBACN,IAAI,QAAQ,EAAE;oBACb,OAAO,CAAC,KAAK,EAAE,CAAA;oBACf,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAA;oBACxD,MAAM,eAAe,EAAE,CAAA;oBACvB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAA;oBACpC,OAAO,CAAC,IAAI,EAAE,CAAA;oBACd,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAA;oBACxD,MAAM,YAAY,EAAE,CAAA;iBACpB;qBAAM;oBACN,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAA;oBACxD,MAAM,YAAY,EAAE,CAAA;iBACpB;aACD;QACF,CAAC;QACD,KAAK,EAAE,KAAK,IAAI,EAAE;YACjB,IAAI,MAAM,EAAE;gBACX,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAA;gBAClD,MAAM,SAAS,EAAE,CAAA;aACjB;iBAAM;gBACN,IAAI,QAAQ,EAAE;oBACb,OAAO,CAAC,KAAK,EAAE,CAAA;oBACf,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAA;oBACxD,MAAM,eAAe,EAAE,CAAA;oBACvB,OAAO,CAAC,IAAI,EAAE,CAAA;oBACd,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAA;oBACxD,MAAM,YAAY,EAAE,CAAA;iBACpB;qBAAM;oBACN,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAA;oBACxD,MAAM,YAAY,EAAE,CAAA;iBACpB;aACD;QACF,CAAC;KACD,CAAA;AACF,CAAC;AAED,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAErD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,CAAA;AACzC,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,CAAA;AAE1C,MAAM,UAAU,YAAY;IAC3B,MAAM,GAAG,GAAG,MAAM,EAAE,CAAA;IACpB,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,4BAA4B,CAAC,CAAA;IAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAA;IACxD,OAAO;QACN,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE,KAAK,IAAI,EAAE;YACjB,IAAI,MAAM,EAAE,CAAC;gBACZ,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAA;gBACxC,MAAM,KAAK,EAAE,CAAA;YACd,CAAC;iBAAM,CAAC;gBACP,IAAI,QAAQ,EAAE,CAAC;oBACd,OAAO,CAAC,KAAK,EAAE,CAAA;oBACf,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAA;oBAClD,MAAM,eAAe,EAAE,CAAA;oBACvB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAA;oBACpC,OAAO,CAAC,IAAI,EAAE,CAAA;gBACf,CAAC;gBACD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAA;gBAC3C,MAAM,KAAK,EAAE,CAAA;YACd,CAAC;QACF,CAAC;QACD,KAAK,EAAE,KAAK,IAAI,EAAE;YACjB,IAAI,MAAM,EAAE,CAAC;gBACZ,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAA;gBACxC,MAAM,KAAK,EAAE,CAAA;YACd,CAAC;iBAAM,CAAC;gBACP,IAAI,QAAQ,EAAE,CAAC;oBACd,OAAO,CAAC,KAAK,EAAE,CAAA;oBACf,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAA;oBACxC,MAAM,KAAK,EAAE,CAAA;oBACb,OAAO,CAAC,IAAI,EAAE,CAAA;gBACf,CAAC;gBACD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAA;gBAC3C,MAAM,KAAK,EAAE,CAAA;YACd,CAAC;QACF,CAAC;KACD,CAAA;AACF,CAAC"}

package/package.json

@@ -1,14 +1,10 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.2.85",
+  "version": "7.0.1-beta.0",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
   "sideEffects": false,
-  "scripts": {
-    "build": "concurrently \"tsc -p ./tsconfig.cjs.json \" \" tsc -p ./tsconfig.esm.json\"",
-    "watch": "concurrently \"tsc -w -p ./tsconfig.cjs.json \" \"tsc -w -p ./tsconfig.esm.json \""
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/zhangyuang/ssr.git"
@@ -30,64 +26,40 @@
   },
   "homepage": "https://github.com/zhangyuang/ssr#readme",
   "dependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.5",
-    "@babel/plugin-proposal-optional-chaining": "^7.16.5",
-    "@babel/plugin-proposal-private-methods": "^7.18.6",
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/plugin-transform-runtime": "^7.9.6",
-    "@babel/preset-env": "^7.5.5",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
-    "@types/semver": "^7.3.13",
     "@vitejs/plugin-react": "^1.3.2",
-    "babel-loader": "^8.0.4",
-    "babel-plugin-import": "1.13.3",
     "babel-preset-react-app": "^10.0.0",
-    "core-js": "^3.6.4",
-    "css-loader": "^5.2.7",
-    "file-loader": "^6.2.0",
-    "less": "^4.1.1",
-    "less-loader": "^7.3.0",
-    "optimize-css-assets-webpack-plugin": "^6.0.0",
-    "ora": "^4.0.4",
-    "postcss": "^8.0.0",
-    "postcss-discard-comments": "^5.0.0",
-    "postcss-flexbugs-fixes": "^5.0.0",
-    "postcss-loader": "^4.0.0",
-    "postcss-modules": "^4.0.0",
-    "postcss-preset-env": "7.6.0",
-    "postcss-safe-parser": "^6.0.0",
-    "react": "^17.0.1",
-    "react-dev-utils": "^11.0.4",
-    "react-dom": "^17.0.0",
     "react-refresh": "^0.12.0",
-    "react-router": "^5.2.1",
-    "react-router-dom": "^5.1.2",
-    "rollup-plugin-visualizer": "^5.12.0",
-    "semver": "^7.3.8",
-    "ssr-common-utils": "^6.0.0",
-    "ssr-deepclone": "^1.0.0",
-    "ssr-hoc-react": "^6.2.7",
-    "ssr-mini-css-extract-plugin": "^1.6.5",
-    "ssr-serialize-javascript": "^6.0.0",
-    "ssr-vite-plugin-style-import": "^2.0.1",
-    "ssr-webpack": "^6.2.10",
-    "ssr-webpack4": "^4.46.2",
-    "terser-webpack-plugin": "^2.3.5",
-    "url-loader": "^4.1.1",
-    "valtio": "^1.11.2",
-    "vite": "^2.9.15",
-    "webpack-bundle-analyzer": "^3.6.1",
-    "webpack-chain": "^6.4.0",
-    "webpack-manifest-plugin": "^2.2.0",
-    "webpackbar": "^5.0.0-3"
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
+    "valtio": "^1.13.2",
+    "ssr-common-utils": "7.0.1-beta.0",
+    "ssr-hoc-react": "7.0.1-beta.0"
+  },
+  "peerDependencies": {
+    "react": ">=17.0.1",
+    "react-dom": ">=17.0.0",
+    "react-router": ">=5.2.1",
+    "react-router-dom": ">=5.1.2",
+    "webpack": "^4.0.0"
   },
   "devDependencies": {
+    "@types/react18": "npm:@types/react@^18.0.0",
+    "@types/react-dom18": "npm:@types/react-dom@^18.0.0",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
     "@types/react-router-dom": "^5.1.3",
     "@types/webpack": "^4.41.10",
     "concurrently": "^5.1.0",
-    "ssr-types": "^6.2.7"
+    "ssr-types": "7.0.1-beta.2",
+    "ssr-webpack": "7.0.1-beta.0",
+    "ssr-vite": "7.0.1-beta.0"
+  },
+  "peerDependenciesMeta": {
+    "webpack": {
+      "optional": true
+    }
+  },
+  "scripts": {
+    "build": "concurrently \"tsc -p ./tsconfig.cjs.json \" \" tsc -p ./tsconfig.esm.json\"",
+    "watch": "concurrently \"tsc -w -p ./tsconfig.cjs.json \" \"tsc -w -p ./tsconfig.esm.json \""
   }
-}
+}

package/src/entry/create.ts

@@ -8,7 +8,6 @@ import { ReactRoutesType } from 'ssr-types'
 import { proxy } from 'valtio'
 
 export const Routes = combineRoutes(declareRoutes, ManualRoutes) as ReactRoutesType
-
 export const ssrCreateContext = () => {
 	const STORE_CONTEXT = createContext<IContext>({
 		state: {}

package/src/entry/{client-entry.tsx → react17-client-entry.tsx}

@@ -1,10 +1,9 @@
+import type { LayoutProps } from 'ssr-types'
+import ReactDOM from 'react-dom'
 import { createElement } from 'react'
-import * as ReactDOM from 'react-dom'
-import 'react-router' // for vite prebundle list
 import { BrowserRouter, Route, Switch } from 'react-router-dom'
 import { preloadComponent, isMicro, setStoreContext, setStore } from 'ssr-common-utils'
 import { wrapComponent } from 'ssr-hoc-react'
-import { LayoutProps } from 'ssr-types'
 import { ssrCreateContext, Routes, createStore } from './create'
 import { AppContext } from './context'
 
@@ -22,45 +21,48 @@ const clientRender = async (): Promise<void> => {
 	setStore(store ?? {})
 	const baseName = isMicro() ? window.clientPrefix : window.prefix
 	const routes = await preloadComponent(FeRoutes, baseName)
-	ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](
-		createElement(
-			BrowserRouter,
-			{
-				basename: baseName
-			},
-			createElement(AppContext, {
-				context,
-				children: createElement(
-					Switch,
+	const container = document.querySelector(window.ssrDevInfo.rootId ?? '#app')!
+	const ele = createElement(
+		//@ts-ignore
+		BrowserRouter,
+		{
+			basename: baseName
+		},
+		createElement(AppContext, {
+			context,
+			children: createElement(
+				Switch,
+				null,
+				createElement(
+					IApp as any,
 					null,
 					createElement(
-						IApp as any,
+						Switch,
 						null,
-						createElement(
-							Switch,
-							null,
-							routes.map((item) => {
-								const { fetch, component, path } = item
-								component.fetch = fetch
-								component.layoutFetch = layoutFetch
-								const WrappedComponent = wrapComponent(component)
-								return createElement(Route, {
-									exact: true,
-									key: path,
-									path: path,
-									render: () =>
-										createElement(WrappedComponent, {
-											key: location.pathname
-										})
-								})
+						routes.map((item) => {
+							const { fetch, component, path } = item
+							component.fetch = fetch
+							component.layoutFetch = layoutFetch
+							const WrappedComponent = wrapComponent(component)
+							return createElement(Route, {
+								exact: true,
+								key: path,
+								path: path,
+								render: (props) =>
+									createElement(WrappedComponent, {
+										...props,
+										key: props.history.location.key
+									})
 							})
-						)
+						})
 					)
 				)
-			})
-		),
-		document.querySelector(window.ssrDevInfo.rootId ?? '#app')
+			)
+		})
 	)
+
+	ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](ele, container)
+
 	if (!window.__USE_VITE__) {
 		;(module as any)?.hot?.accept?.()
 	}

package/src/entry/react18-client-entry.tsx

@@ -0,0 +1,80 @@
+import type { hydrateRoot as HydrateRoot, createRoot as CreateRoot } from 'react-dom18/client'
+import type { LayoutProps } from 'ssr-types'
+
+//@ts-ignore
+import { hydrateRoot, createRoot } from 'react-dom/client'
+import { createElement } from 'react'
+import { BrowserRouter, Route, Switch } from 'react-router-dom'
+import { preloadComponent, isMicro, setStoreContext, setStore } from 'ssr-common-utils'
+import { wrapComponent } from 'ssr-hoc-react'
+import { ssrCreateContext, Routes, createStore } from './create'
+import { AppContext } from './context'
+
+const { FeRoutes, layoutFetch, App } = Routes
+
+const clientRender = async (): Promise<void> => {
+	const IApp =
+		App ??
+		function (props: LayoutProps) {
+			return props.children!
+		}
+	const context = ssrCreateContext() as any
+	setStoreContext(context)
+	const store = createStore(window.__VALTIO_DATA__)
+	setStore(store ?? {})
+	const baseName = isMicro() ? window.clientPrefix : window.prefix
+	const routes = await preloadComponent(FeRoutes, baseName)
+	const container = document.querySelector(window.ssrDevInfo.rootId ?? '#app')!
+	const ele = createElement(
+		//@ts-ignore
+		BrowserRouter,
+		{
+			basename: baseName
+		},
+		createElement(AppContext, {
+			context,
+			children: createElement(
+				Switch,
+				null,
+				createElement(
+					IApp as any,
+					null,
+					createElement(
+						Switch,
+						null,
+						routes.map((item) => {
+							const { fetch, component, path } = item
+							component.fetch = fetch
+							component.layoutFetch = layoutFetch
+							const WrappedComponent = wrapComponent(component)
+							return createElement(Route, {
+								exact: true,
+								key: path,
+								path: path,
+								render: (props) =>
+									createElement(WrappedComponent, {
+										...props,
+										key: props.history.location.key
+									})
+							})
+						})
+					)
+				)
+			)
+		})
+	)
+	if (window.__USE_SSR__) {
+		;(hydrateRoot as typeof HydrateRoot)(container, ele)
+	} else {
+		const root = (createRoot as typeof CreateRoot)(container)
+		root.render(ele)
+	}
+
+	if (!window.__USE_VITE__) {
+		;(module as any)?.hot?.accept?.()
+	}
+}
+
+clientRender()
+
+export { clientRender }

package/src/entry/server-entry.tsx

@@ -1,9 +1,10 @@
+import type { renderToPipeableStream } from 'react-dom18/server'
 import { PassThrough } from 'stream'
 import * as React from 'react'
 import { createElement } from 'react'
+import * as ReactDOMServer from 'react-dom/server'
 import { StaticRouter } from 'react-router-dom'
-import { renderToString, renderToNodeStream } from 'react-dom/server'
-import { findRoute, getManifest, logGreen, normalizePath, getAsyncCssChunk, getAsyncJsChunk, splitPageInfo, reactRefreshFragment, localStorageWrapper, checkRoute, useStore } from 'ssr-common-utils'
+import { findRoute, getManifest, logGreen, normalizePath, getAsyncCssChunk, getAsyncJsChunk, splitPageInfo, reactRefreshFragment, localStorageWrapper, checkRoute, useStore, isReact18, getClientEntry } from 'ssr-common-utils'
 import { ISSRContext, IConfig, ReactESMPreloadFeRouteItem, DynamicFC, StaticFC } from 'ssr-types'
 import { serialize } from 'ssr-serialize-javascript'
 import { AppContext } from './context'
@@ -11,9 +12,12 @@ import { Routes, ssrCreateContext, createStore } from './create'
 
 const { FeRoutes, layoutFetch, state, Layout } = Routes
 
+type ReactDOMServerType = typeof ReactDOMServer & {
+	renderToPipeableStream: typeof renderToPipeableStream
+}
 const serverRender = async (ctx: ISSRContext, config: IConfig) => {
 	const context = ssrCreateContext()
-	const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix, stream, rootId, hashRouter, streamHighWaterMark } = config
+	const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix, onReady, onError, stream, rootId, hashRouter, streamHighWaterMark } = config
 	const rawPath = ctx.request.path ?? ctx.request.url
 	const path = normalizePath(rawPath, prefix)
 	const routeItem = findRoute<ReactESMPreloadFeRouteItem>(FeRoutes, path)
@@ -61,7 +65,7 @@ const serverRender = async (ctx: ISSRContext, config: IConfig) => {
 						/>
 					]
 				: []),
-			...(isVite && isDev ? [<script type="module" src="/node_modules/ssr-plugin-react/esm/entry/client-entry.js" key="vite-react-entry" />] : []),
+			...(isVite && isDev ? [<script type="module" src={`/node_modules/ssr-plugin-react/esm/entry/${getClientEntry()}.js`} key="vite-react-entry" />] : []),
 			...dynamicJsOrder
 				.map((js) => manifest[js])
 				.filter(Boolean)
@@ -124,7 +128,18 @@ const serverRender = async (ctx: ISSRContext, config: IConfig) => {
 			})
 		)
 		// for ctx.body will loose asynclocalstorage context, consume stream in advance like vue2/3
-		return stream ? renderToNodeStream(ele).pipe(new PassThrough({ highWaterMark: streamHighWaterMark })) : renderToString(ele)
+		if (isReact18()) {
+			return stream
+				? (ReactDOMServer as ReactDOMServerType)
+						.renderToPipeableStream(ele, {
+							onAllReady: onReady,
+							onError: onError as any
+						})
+						.pipe(new PassThrough({ highWaterMark: streamHighWaterMark }))
+				: ReactDOMServer.renderToString(ele)
+		} else {
+			return stream ? ReactDOMServer.renderToNodeStream(ele).pipe(new PassThrough({ highWaterMark: streamHighWaterMark })) : ReactDOMServer.renderToString(ele)
+		}
 	}
 
 	return await localStorageWrapper.run(