ssr-plugin-react 6.2.0 → 6.2.3

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.2.3](https://github.com/zhangyuang/ssr/compare/v6.2.1...v6.2.3) (2022-04-01)
+
+
+### Features
+
+* judge microapp environment automaticlly ([85395dc](https://github.com/zhangyuang/ssr/commit/85395dcd3755ec2d2fdbeb22b2aa7097035e07d2))
+
+
+
+
+
+## [6.2.2](https://github.com/zhangyuang/ssr/compare/v6.2.1...v6.2.2) (2022-04-01)
+
+
+### Features
+
+* judge microapp environment automaticlly ([85395dc](https://github.com/zhangyuang/ssr/commit/85395dcd3755ec2d2fdbeb22b2aa7097035e07d2))
+
+
+
+
+
+## [6.2.1](https://github.com/zhangyuang/ssr/compare/v6.2.0...v6.2.1) (2022-04-01)
+
+
+### Features
+
+* support clientPrefix in vue2 react ([05dd609](https://github.com/zhangyuang/ssr/commit/05dd609e685d7b0855557733738f9ce74979c389))
+
+
+
+
+
 # [6.2.0](https://github.com/zhangyuang/ssr/compare/v6.2.0-alpha.0...v6.2.0) (2022-03-31)
 
 **Note:** Version bump only for package ssr-plugin-react

package/cjs/entry/client-entry.js

@@ -10,12 +10,12 @@ const create_router_1 = require("./create-router");
 const context_1 = require("./context");
 const { FeRoutes, layoutFetch, App, PrefixRouterBase } = create_router_1.Routes;
 const clientRender = async () => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const IApp = App !== null && App !== void 0 ? App : function (props) {
         return props.children;
     };
     // 客户端渲染||hydrate
-    const baseName = (_a = window.prefix) !== null && _a !== void 0 ? _a : PrefixRouterBase;
+    const baseName = (_b = (_a = (window.microApp && window.clientPrefix)) !== null && _a !== void 0 ? _a : window.prefix) !== null && _b !== void 0 ? _b : PrefixRouterBase;
     const routes = await (0, ssr_client_utils_1.preloadComponent)(FeRoutes, baseName);
     ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](React.createElement(react_router_dom_1.BrowserRouter, { basename: baseName },
         React.createElement(context_1.AppContext, null,
@@ -31,7 +31,7 @@ const clientRender = async () => {
                         return (React.createElement(react_router_dom_1.Route, { exact: true, key: path, path: path, render: () => React.createElement(WrappedComponent, { key: location.pathname }) }));
                     })))))), document.getElementById('app'));
     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); // webpack 场景下的 hmr
+        (_d = (_c = module === null || module === void 0 ? void 0 : module.hot) === null || _c === void 0 ? void 0 : _c.accept) === null || _d === void 0 ? void 0 : _d.call(_c); // webpack 场景下的 hmr
     }
 };
 exports.clientRender = clientRender;

package/cjs/entry/server-entry.js

@@ -15,7 +15,7 @@ const { FeRoutes, layoutFetch, PrefixRouterBase, state } = create_router_1.Route
 const serialize = serializeWrap.default || serializeWrap;
 const serverRender = async (ctx, config) => {
     var _a;
-    const { cssOrder, jsOrder, dynamic, mode, parallelFetch, disableClientRender, prefix, isVite, isDev } = config;
+    const { cssOrder, jsOrder, dynamic, mode, parallelFetch, disableClientRender, prefix, isVite, isDev, clientPrefix } = config;
     let path = ctx.request.path; // 这里取 pathname 不能够包含 queryString
     const base = prefix !== null && prefix !== void 0 ? prefix : PrefixRouterBase; // 以开发者实际传入的为最高优先级
     if (base) {
@@ -96,7 +96,7 @@ const serverRender = async (ctx, config) => {
     }
     const combineData = isCsr ? null : Object.assign(state !== null && state !== void 0 ? state : {}, layoutFetchData !== null && layoutFetchData !== void 0 ? layoutFetchData : {}, fetchData !== null && fetchData !== void 0 ? fetchData : {});
     const injectState = isCsr ? null : React.createElement("script", { dangerouslySetInnerHTML: {
-            __html: `window.__USE_SSR__=true; window.__INITIAL_DATA__ =${serialize(combineData)}; ${base && `window.prefix="${base}"`}`
+            __html: `window.__USE_SSR__=true; window.__INITIAL_DATA__ =${serialize(combineData)}; ${base && `window.prefix="${base}"`};${clientPrefix && `window.clientPrefix="${clientPrefix}"`}`
         } });
     return (React.createElement(react_router_dom_1.StaticRouter, { location: ctx.request.url },
         React.createElement(create_context_1.STORE_CONTEXT.Provider, { value: { state: combineData } },

package/esm/entry/client-entry.js

@@ -7,12 +7,12 @@ import { Routes } from './create-router';
 import { AppContext } from './context';
 const { FeRoutes, layoutFetch, App, PrefixRouterBase } = Routes;
 const clientRender = async () => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const IApp = App !== null && App !== void 0 ? App : function (props) {
         return props.children;
     };
     // 客户端渲染||hydrate
-    const baseName = (_a = window.prefix) !== null && _a !== void 0 ? _a : PrefixRouterBase;
+    const baseName = (_b = (_a = (window.microApp && window.clientPrefix)) !== null && _a !== void 0 ? _a : window.prefix) !== null && _b !== void 0 ? _b : PrefixRouterBase;
     const routes = await preloadComponent(FeRoutes, baseName);
     ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](React.createElement(BrowserRouter, { basename: baseName },
         React.createElement(AppContext, null,
@@ -28,7 +28,7 @@ const clientRender = async () => {
                         return (React.createElement(Route, { exact: true, key: path, path: path, render: () => React.createElement(WrappedComponent, { key: location.pathname }) }));
                     })))))), document.getElementById('app'));
     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); // webpack 场景下的 hmr
+        (_d = (_c = module === null || module === void 0 ? void 0 : module.hot) === null || _c === void 0 ? void 0 : _c.accept) === null || _d === void 0 ? void 0 : _d.call(_c); // webpack 场景下的 hmr
     }
 };
 if (!window.__disableClientRender__) {

package/esm/entry/server-entry.js

@@ -12,7 +12,7 @@ const { FeRoutes, layoutFetch, PrefixRouterBase, state } = Routes;
 const serialize = serializeWrap.default || serializeWrap;
 const serverRender = async (ctx, config) => {
     var _a;
-    const { cssOrder, jsOrder, dynamic, mode, parallelFetch, disableClientRender, prefix, isVite, isDev } = config;
+    const { cssOrder, jsOrder, dynamic, mode, parallelFetch, disableClientRender, prefix, isVite, isDev, clientPrefix } = config;
     let path = ctx.request.path; // 这里取 pathname 不能够包含 queryString
     const base = prefix !== null && prefix !== void 0 ? prefix : PrefixRouterBase; // 以开发者实际传入的为最高优先级
     if (base) {
@@ -93,7 +93,7 @@ const serverRender = async (ctx, config) => {
     }
     const combineData = isCsr ? null : Object.assign(state !== null && state !== void 0 ? state : {}, layoutFetchData !== null && layoutFetchData !== void 0 ? layoutFetchData : {}, fetchData !== null && fetchData !== void 0 ? fetchData : {});
     const injectState = isCsr ? null : React.createElement("script", { dangerouslySetInnerHTML: {
-            __html: `window.__USE_SSR__=true; window.__INITIAL_DATA__ =${serialize(combineData)}; ${base && `window.prefix="${base}"`}`
+            __html: `window.__USE_SSR__=true; window.__INITIAL_DATA__ =${serialize(combineData)}; ${base && `window.prefix="${base}"`};${clientPrefix && `window.clientPrefix="${clientPrefix}"`}`
         } });
     return (React.createElement(StaticRouter, { location: ctx.request.url },
         React.createElement(Context.Provider, { value: { state: combineData } },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.2.0",
+  "version": "6.2.3",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -55,10 +55,10 @@
     "postcss-safe-parser": "^6.0.0",
     "react-dev-utils": "^11.0.4",
     "serialize-javascript": "^6.0.0",
-    "ssr-client-utils": "^6.2.0",
-    "ssr-hoc-react": "^6.2.0",
-    "ssr-server-utils": "^6.2.0",
-    "ssr-webpack": "^6.2.0",
+    "ssr-client-utils": "^6.2.3",
+    "ssr-hoc-react": "^6.2.3",
+    "ssr-server-utils": "^6.2.3",
+    "ssr-webpack": "^6.2.3",
     "terser-webpack-plugin": "^2.3.5",
     "url-loader": "^4.1.1",
     "vite": "^2.7.0",
@@ -74,7 +74,7 @@
     "@types/react-router-dom": "^5.1.3",
     "@types/webpack": "^4.41.10",
     "concurrently": "^5.1.0",
-    "ssr-types-react": "^6.2.0"
+    "ssr-types-react": "^6.2.3"
   },
-  "gitHead": "d57f07b1a903c18e03807d2937aad4371cf31499"
+  "gitHead": "335e2e09d1843665ca9dda82df5f2566612a4e47"
 }

package/src/entry/client-entry.tsx

@@ -17,7 +17,7 @@ const clientRender = async (): Promise<void> => {
     return props.children!
   }
   // 客户端渲染||hydrate
-  const baseName = window.prefix ?? PrefixRouterBase
+  const baseName = (window.microApp && window.clientPrefix) ?? window.prefix ?? PrefixRouterBase
   const routes = await preloadComponent(FeRoutes, baseName)
   ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](
     <BrowserRouter basename={baseName}>

package/src/entry/server-entry.tsx

@@ -14,7 +14,7 @@ const { FeRoutes, layoutFetch, PrefixRouterBase, state } = Routes as ReactRoutes
 const serialize = serializeWrap.default || serializeWrap
 
 const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.ReactElement> => {
-  const { cssOrder, jsOrder, dynamic, mode, parallelFetch, disableClientRender, prefix, isVite, isDev } = config
+  const { cssOrder, jsOrder, dynamic, mode, parallelFetch, disableClientRender, prefix, isVite, isDev, clientPrefix } = config
   let path = ctx.request.path // 这里取 pathname 不能够包含 queryString
   const base = prefix ?? PrefixRouterBase // 以开发者实际传入的为最高优先级
   if (base) {
@@ -103,7 +103,7 @@ const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.Re
   }
   const combineData = isCsr ? null : Object.assign(state ?? {}, layoutFetchData ?? {}, fetchData ?? {})
   const injectState = isCsr ? null : <script dangerouslySetInnerHTML={{
-    __html: `window.__USE_SSR__=true; window.__INITIAL_DATA__ =${serialize(combineData)}; ${base && `window.prefix="${base}"`}`
+    __html: `window.__USE_SSR__=true; window.__INITIAL_DATA__ =${serialize(combineData)}; ${base && `window.prefix="${base}"`};${clientPrefix && `window.clientPrefix="${clientPrefix}"`}`
   }} />
 
   return (