ssr-plugin-react 6.1.3 → 6.1.7

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.1.7](https://github.com/ykfe/ssr/compare/ssr-plugin-react@6.1.6...ssr-plugin-react@6.1.7) (2021-11-22)
+
+
+### Bug Fixes
+
+* restore staicRouter ([1150a6c](https://github.com/ykfe/ssr/commit/1150a6c4e4fe17d4416e35d619f8aac10837a7b8))
+
+
+
+
+
+## [6.1.6](https://github.com/ykfe/ssr/compare/ssr-plugin-react@6.1.5...ssr-plugin-react@6.1.6) (2021-11-19)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
+## [6.1.5](https://github.com/ykfe/ssr/compare/ssr-plugin-react@6.1.4...ssr-plugin-react@6.1.5) (2021-11-18)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
+## [6.1.4](https://github.com/ykfe/ssr/compare/ssr-plugin-react@6.1.3...ssr-plugin-react@6.1.4) (2021-11-17)
+
+
+### Bug Fixes
+
+*  boolean GENERATE_SOURCEMAP ([#133](https://github.com/ykfe/ssr/issues/133)) ([dbaeed8](https://github.com/ykfe/ssr/commit/dbaeed8efcf3d232c5754b2cfd6f3a664596610c))
+
+
+
+
+
 ## [6.1.3](https://github.com/ykfe/ssr/compare/ssr-plugin-react@6.1.2...ssr-plugin-react@6.1.3) (2021-11-07)
 
 **Note:** Version bump only for package ssr-plugin-react

package/README.md

@@ -103,6 +103,9 @@
 <td align="center" style="height: 100px"><a href="https://blog.dreamer2q.wang/" target="_blank"><img src="https://res.wx.qq.com/op_res/MxxGgjPFRiTgjiReUefs2aMce-SgNvxxTB9U87YYhcOu6KPw9er7r2Lc0ne-b90nFstTUpc8REDwpxfUreKV1g" width="200px;margin: 20px 0" alt="Dream2qBlog"/><br />
 <a href="https://blog.dreamer2q.wang/" target="_bvlank"><b>个人博客
 </b></a></td>
+<td align="center" style="height: 100px"><a href="https://jiawu.dewu.com" target="_blank"><img src="https://cdn.poizon.com/node-common/31116a45953ad8b468c6c832036aac88.png" width="200px;margin: 20px 0" alt="Dream2qBlog"/><br />
+<a href="https://jiawu.dewu.com" target="_bvlank"><b>得物
+</b></a></td>
 </tr>
 </table>
 
@@ -259,7 +262,7 @@ $ npm run start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
 
 <div style="display:flex">
 <img src="https://res.wx.qq.com/op_res/7F1t4Z8yCHWilehbcFGjAj0yVn0URMiWBGVJa-TVu_eqw5IwUXA2kPYBnfX6YRHy0FVBB-yC6l0IEL02QTJkLg" width="300">
-<img src="https://res.wx.qq.com/op_res/5ApFtMe8Bx0buRwIkD2USbwyyXNEVYR_KkOmGri9hv9NV8PhpfWTD0lPlZwPM1MeKVrPnCouEAdP0R_do_CNqQ" width="300">
+<img src="https://res.wx.qq.com/op_res/LKApEGZg8dfVdons6UrO3dU1NRHcIes4wn3WQqHI60FOyMB5VlhYWiPiZjB-NlijbCZTX4Za4-isfAQSMK58pw" width="300">
 </div>
 
 ## 前端开发手册

package/cjs/config/client.js

@@ -13,7 +13,7 @@ const loadModule = require.resolve;
 let asyncChunkMap = {};
 const getClientWebpack = (chain) => {
     const { isDev, chunkName, getOutput, cwd, useHash, chainClientConfig } = (0, ssr_server_utils_1.loadConfig)();
-    const shouldUseSourceMap = isDev || process.env.GENERATE_SOURCEMAP;
+    const shouldUseSourceMap = isDev || Boolean(process.env.GENERATE_SOURCEMAP);
     const publicPath = (0, ssr_server_utils_1.getOutputPublicPath)();
     (0, base_1.getBaseConfig)(chain, false);
     chain.devtool(isDev ? 'cheap-module-source-map' : (shouldUseSourceMap ? 'source-map' : false));

package/cjs/entry/server-entry.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serverRender = void 0;
 const React = require("react");
+const react_router_dom_1 = require("react-router-dom");
 const ssr_server_utils_1 = require("ssr-server-utils");
 const serialize = require("serialize-javascript");
 // @ts-expect-error
@@ -96,7 +97,8 @@ const serverRender = async (ctx, config) => {
     const injectState = isCsr ? null : React.createElement("script", { dangerouslySetInnerHTML: {
             __html: `window.__USE_SSR__=true; window.__INITIAL_DATA__ =${serialize(combineData)}`
         } });
-    return (React.createElement(create_context_1.STORE_CONTEXT.Provider, { value: { state: combineData } },
-        React.createElement(index_tsx_1.default, { ctx: ctx, config: config, staticList: staticList, injectState: injectState }, isCsr ? React.createElement(React.Fragment, null) : React.createElement(Component, null))));
+    return (React.createElement(react_router_dom_1.StaticRouter, null,
+        React.createElement(create_context_1.STORE_CONTEXT.Provider, { value: { state: combineData } },
+            React.createElement(index_tsx_1.default, { ctx: ctx, config: config, staticList: staticList, injectState: injectState }, isCsr ? React.createElement(React.Fragment, null) : React.createElement(Component, null)))));
 };
 exports.serverRender = serverRender;

package/esm/config/client.js

@@ -10,7 +10,7 @@ const loadModule = require.resolve;
 let asyncChunkMap = {};
 const getClientWebpack = (chain) => {
     const { isDev, chunkName, getOutput, cwd, useHash, chainClientConfig } = loadConfig();
-    const shouldUseSourceMap = isDev || process.env.GENERATE_SOURCEMAP;
+    const shouldUseSourceMap = isDev || Boolean(process.env.GENERATE_SOURCEMAP);
     const publicPath = getOutputPublicPath();
     getBaseConfig(chain, false);
     chain.devtool(isDev ? 'cheap-module-source-map' : (shouldUseSourceMap ? 'source-map' : false));

package/esm/entry/server-entry.js

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { StaticRouter } from 'react-router-dom';
 import { findRoute, getManifest, logGreen, normalizePath, addAsyncChunk } from 'ssr-server-utils';
 import * as serialize from 'serialize-javascript';
 // @ts-expect-error
@@ -93,7 +94,8 @@ const serverRender = async (ctx, config) => {
     const injectState = isCsr ? null : React.createElement("script", { dangerouslySetInnerHTML: {
             __html: `window.__USE_SSR__=true; window.__INITIAL_DATA__ =${serialize(combineData)}`
         } });
-    return (React.createElement(Context.Provider, { value: { state: combineData } },
-        React.createElement(Layout, { ctx: ctx, config: config, staticList: staticList, injectState: injectState }, isCsr ? React.createElement(React.Fragment, null) : React.createElement(Component, null))));
+    return (React.createElement(StaticRouter, null,
+        React.createElement(Context.Provider, { value: { state: combineData } },
+            React.createElement(Layout, { ctx: ctx, config: config, staticList: staticList, injectState: injectState }, isCsr ? React.createElement(React.Fragment, null) : React.createElement(Component, null)))));
 };
 export { serverRender };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.1.3",
+  "version": "6.1.7",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -53,10 +53,10 @@
     "postcss-safe-parser": "4.0.1",
     "react-dev-utils": "^11.0.4",
     "serialize-javascript": "^3.0.0",
-    "ssr-client-utils": "^5.6.37",
-    "ssr-hoc-react": "^6.0.3",
-    "ssr-server-utils": "^5.7.6",
-    "ssr-webpack": "^5.7.5",
+    "ssr-client-utils": "^5.6.39",
+    "ssr-hoc-react": "^6.0.6",
+    "ssr-server-utils": "^5.7.8",
+    "ssr-webpack": "^5.7.7",
     "terser-webpack-plugin": "^2.3.5",
     "url-loader": "^4.1.1",
     "webpack-bundle-analyzer": "^3.6.1",
@@ -70,7 +70,7 @@
     "@types/react-router-dom": "^5.1.3",
     "@types/serialize-javascript": "^1.5.0",
     "@types/webpack": "^4.41.10",
-    "ssr-types-react": "^6.0.3"
+    "ssr-types-react": "^6.0.5"
   },
-  "gitHead": "c6832ec680e252bff73ab1721cb49dbdbf67e52a"
+  "gitHead": "f48f8edfcbf902c4035694bcadac421046d13c52"
 }

package/src/config/client.ts

@@ -13,7 +13,7 @@ let asyncChunkMap: Record<string, string> = {}
 
 const getClientWebpack = (chain: WebpackChain) => {
   const { isDev, chunkName, getOutput, cwd, useHash, chainClientConfig } = loadConfig()
-  const shouldUseSourceMap = isDev || process.env.GENERATE_SOURCEMAP
+  const shouldUseSourceMap = isDev || Boolean(process.env.GENERATE_SOURCEMAP)
   const publicPath = getOutputPublicPath()
   getBaseConfig(chain, false)
   chain.devtool(isDev ? 'cheap-module-source-map' : (shouldUseSourceMap ? 'source-map' : false))

package/src/entry/server-entry.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react'
+import { StaticRouter } from 'react-router-dom'
 import { findRoute, getManifest, logGreen, normalizePath, addAsyncChunk } from 'ssr-server-utils'
 import { ISSRContext, IGlobal, IConfig, ReactRoutesType, ReactESMFeRouteItem } from 'ssr-types-react'
 import * as serialize from 'serialize-javascript'
@@ -109,11 +110,13 @@ const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.Re
   }} />
 
   return (
-    <Context.Provider value={{ state: combineData }}>
-      <Layout ctx={ctx} config={config} staticList={staticList} injectState={injectState}>
-        {isCsr ? <></> : <Component />}
-      </Layout>
-    </Context.Provider>
+    <StaticRouter>
+      <Context.Provider value={{ state: combineData }}>
+        <Layout ctx={ctx} config={config} staticList={staticList} injectState={injectState}>
+          {isCsr ? <></> : <Component />}
+        </Layout>
+      </Context.Provider>
+    </StaticRouter>
   )
 }