ssr-plugin-react 6.1.5 → 6.1.9

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 ykfe
+Copyright (c) 2019 zhangyuang
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -13,18 +13,18 @@
 </div>
 <br />
 <div align="center">
-<a href="https://github.com/ykfe/ssr/actions" target="_blank"><img src="https://github.com/ykfe/ssr/workflows/CI/badge.svg" alt="githubActions"></a>
+<a href="https://github.com/zhangyuang/ssr/actions" target="_blank"><img src="https://github.com/zhangyuang/ssr/workflows/CI/badge.svg" alt="githubActions"></a>
 <a href="https://www.cypress.io/" target="_blank"><img src="https://img.shields.io/badge/cypress-dashboard-brightgreen.svg" alt="cypress"></a>
 <a href="https://npmcharts.com/compare/ssr" target="_blank"><img src="https://img.shields.io/npm/dm/ssr" alt="download"></a>
 <a href="https://standardjs.com" target="_blank"><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="standardjs"></a>
-<a href="https://github.com/ykfe/ssr" target="_blank"><img src="https://img.shields.io/npm/l/vue.svg" alt="License"></a>
-<a href="https://github.com/ykfe/ssr" target="_blank"><img src="https://img.shields.io/badge/node-%3E=12-green.svg" alt="Node"></a>
+<a href="https://github.com/zhangyuang/ssr" target="_blank"><img src="https://img.shields.io/npm/l/vue.svg" alt="License"></a>
+<a href="https://github.com/zhangyuang/ssr" target="_blank"><img src="https://img.shields.io/badge/node-%3E=12-green.svg" alt="Node"></a>
 </div>
 <br />
 
 `ssr` 框架是为前端框架在服务端渲染的场景下所打造的开箱即用的服务端渲染框架。了解什么是服务端渲染请查看[文档](http://doc.ssr-fc.com/docs/features$ssr)
 
-此框架脱胎于 [egg-react-ssr](https://github.com/ykfe/egg-react-ssr) 项目和`ssr` v4.3版本（midway-faas + react ssr），在之前的基础上做了诸多演进，通过插件化的代码组织形式，支持任意服务端框架与任意前端框架的组合使用。开发者可以选择通过 Serverless 方式部署或是以传统 Node.js 的应用形式部署，并且我们专注于提升 Serverless 场景下服务端渲染应用的开发体验，打造了一站式的开发，发布应用服务的功能。最大程度提升开发者的开发体验，将应用的开发，部署成本降到最低。
+此框架脱胎于 [egg-react-ssr](https://github.com/zhangyuang/egg-react-ssr) 项目和`ssr` v4.3版本（midway-faas + react ssr），在之前的基础上做了诸多演进，通过插件化的代码组织形式，支持任意服务端框架与任意前端框架的组合使用。开发者可以选择通过 Serverless 方式部署或是以传统 Node.js 的应用形式部署，并且我们专注于提升 Serverless 场景下服务端渲染应用的开发体验，打造了一站式的开发，发布应用服务的功能。最大程度提升开发者的开发体验，将应用的开发，部署成本降到最低。
 
 在最新的 v5.0 版本中，同时支持 `React` 和 `Vue2/Vue3` 作为服务端渲染框架且构建工具我们同样支持了最流行的 `Vite` 来提升应用的启动速度和 HMR 速度，且提供一键以 Serverless 的形式发布上云的功能。我们可以非常有自信说它是地球上最先进的 `ssr` 框架。如果你希望获得开箱即用的体验且能够一键部署上云，请选择 `ssr` 框架。
 
@@ -44,7 +44,7 @@
 
 ## 哪些应用在使用
 
-正在使用这个项目的公司(应用), 如果您正在使用但名单中没有列出来的话请提 [issue](https://github.com/ykfe/ssr/issues)，欢迎推广分享，我们将随时提供技术支持
+正在使用这个项目的公司(应用), 如果您正在使用但名单中没有列出来的话请提 [issue](https://github.com/zhangyuang/ssr/issues)，欢迎推广分享，我们将随时提供技术支持
 
 <table>
 <tr>
@@ -106,6 +106,14 @@
 <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>
+<td align="center" style="height: 100px"><a href="https://www.habisummercamp.com/" target="_blank"><img src="https://res.wx.qq.com/op_res/XXUpF56bDue53vZadoCSPSnqKF3bZqPOQnqsPa_ngEARa0OUIW22pX7eKsftPb6pc5ny62cR_wXM4g5xJ7G3DQ
+" width="200px;margin: 20px 0" alt="Dream2qBlog"/><br />
+<a href="https://www.habisummercamp.com/" target="_bvlank"><b>HappyPC
+</b></a></td>
+<td align="center" style="height: 100px"><a href="https://m.habisummercamp.com/" target="_blank"><img src="https://res.wx.qq.com/op_res/XXUpF56bDue53vZadoCSPSnqKF3bZqPOQnqsPa_ngEARa0OUIW22pX7eKsftPb6pc5ny62cR_wXM4g5xJ7G3DQ
+" width="200px;margin: 20px 0" alt="Dream2qBlog"/><br />
+<a href="https://m.habisummercamp.com/" target="_bvlank"><b>HappyMobile
+</b></a></td>
 </tr>
 </table>
 
@@ -156,12 +164,12 @@
 
 注意: 在 `Midway.js` `Nest.js` 场景下我们都已实现了一键部署到 `Serverless` 平台的能力。但底层实现略有差异。更加详细的介绍可以阅读 [Serverless](http://doc.ssr-fc.com/docs/features$serverless) 章节。如需要大量使用 `Serverless` 平台提供的能力，我们建议创建 `Midway.js` 类型的应用。强烈建议阅读我们的 [官方文档](http://doc.ssr-fc.com/) 来获得更加详细的了解
 
-- [midway-react-ssr](https://github.com/ykfe/ssr/tree/dev/example/midway-react-ssr)
-- [midway-vue-ssr](https://github.com/ykfe/ssr/tree/dev/example/midway-vue-ssr)
-- [midway-vue3-ssr](https://github.com/ykfe/ssr/tree/dev/example/midway-vue3-ssr)
-- [nestjs-react-ssr](https://github.com/ykfe/ssr/tree/dev/example/nestjs-react-ssr)
-- [nestjs-vue-ssr](https://github.com/ykfe/ssr/tree/dev/example/nestjs-vue-ssr)
-- [nestjs-vue3-ssr](https://github.com/ykfe/ssr/tree/dev/example/nestjs-vue3-ssr)
+- [midway-react-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/midway-react-ssr)
+- [midway-vue-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/midway-vue-ssr)
+- [midway-vue3-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/midway-vue3-ssr)
+- [nestjs-react-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/nestjs-react-ssr)
+- [nestjs-vue-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/nestjs-vue-ssr)
+- [nestjs-vue3-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/nestjs-vue3-ssr)
 
 开发者可根据实际技术栈需要创建不同类型的应用快速开始
 
@@ -232,21 +240,21 @@ $ npm run start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
 [ssr-types-react-status]: https://img.shields.io/npm/v/ssr-types-react.svg
 [ssr-webpack-status]: https://img.shields.io/npm/v/ssr-webpack.svg
 
-[ssr]: https://github.com/ykfe/ssr/tree/dev/packages/cli
-[ssr-client-utils]: https://github.com/ykfe/ssr/tree/dev/packages/client-utils
-[ssr-core-react]: https://github.com/ykfe/ssr/tree/dev/packages/core-react
-[ssr-core-vue]: https://github.com/ykfe/ssr/tree/dev/packages/core-vue
-[ssr-hoc-react]: https://github.com/ykfe/ssr/tree/dev/packages/hoc-react
-[ssr-hoc-vue3]: https://github.com/ykfe/ssr/tree/dev/packages/hoc-vue3
-[ssr-plugin-midway]: https://github.com/ykfe/ssr/tree/dev/packages/plugin-midway
-[ssr-plugin-nestjs]: https://github.com/ykfe/ssr/tree/dev/packages/plugin-nestjs
-[ssr-plugin-react]: https://github.com/ykfe/ssr/tree/dev/packages/plugin-react
-[ssr-plugin-vue]: https://github.com/ykfe/ssr/tree/dev/packages/plugin-vue
-[ssr-plugin-vue3]: https://github.com/ykfe/ssr/tree/dev/packages/plugin-vue3
-[ssr-server-utils]: https://github.com/ykfe/ssr/tree/dev/packages/server-utils
-[ssr-types]: https://github.com/ykfe/ssr/tree/dev/packages/types
-[ssr-types-react]: https://github.com/ykfe/ssr/tree/dev/packages/types-react
-[ssr-webpack]: https://github.com/ykfe/ssr/tree/dev/packages/webpack
+[ssr]: https://github.com/zhangyuang/ssr/tree/dev/packages/cli
+[ssr-client-utils]: https://github.com/zhangyuang/ssr/tree/dev/packages/client-utils
+[ssr-core-react]: https://github.com/zhangyuang/ssr/tree/dev/packages/core-react
+[ssr-core-vue]: https://github.com/zhangyuang/ssr/tree/dev/packages/core-vue
+[ssr-hoc-react]: https://github.com/zhangyuang/ssr/tree/dev/packages/hoc-react
+[ssr-hoc-vue3]: https://github.com/zhangyuang/ssr/tree/dev/packages/hoc-vue3
+[ssr-plugin-midway]: https://github.com/zhangyuang/ssr/tree/dev/packages/plugin-midway
+[ssr-plugin-nestjs]: https://github.com/zhangyuang/ssr/tree/dev/packages/plugin-nestjs
+[ssr-plugin-react]: https://github.com/zhangyuang/ssr/tree/dev/packages/plugin-react
+[ssr-plugin-vue]: https://github.com/zhangyuang/ssr/tree/dev/packages/plugin-vue
+[ssr-plugin-vue3]: https://github.com/zhangyuang/ssr/tree/dev/packages/plugin-vue3
+[ssr-server-utils]: https://github.com/zhangyuang/ssr/tree/dev/packages/server-utils
+[ssr-types]: https://github.com/zhangyuang/ssr/tree/dev/packages/types
+[ssr-types-react]: https://github.com/zhangyuang/ssr/tree/dev/packages/types-react
+[ssr-webpack]: https://github.com/zhangyuang/ssr/tree/dev/packages/webpack
 ## CONTRIBUTING
 
 如果你想为本应用贡献代码，请阅读[贡献文档](./CONTRIBUTING.md)，我们为你准备了丰富的脚本用于 bootstrap
@@ -257,12 +265,12 @@ $ npm run start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
 
 ## 答疑群
 
-虽然我们已经尽力检查了一遍应用，但仍有可能有疏漏的地方，如果你在使用过程中发现任何问题或者建议，欢迎提[issue](https://github.com/ykfe/ssr/issues)或者[PR](https://github.com/ykfe/ssr/pulls)
+虽然我们已经尽力检查了一遍应用，但仍有可能有疏漏的地方，如果你在使用过程中发现任何问题或者建议，欢迎提[issue](https://github.com/zhangyuang/ssr/issues)或者[PR](https://github.com/zhangyuang/ssr/pulls)
 欢迎直接扫码加入钉钉群或者微信群
 
 <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/vyuXIPm5k4N_KqbNGGMW6l-wBFQWyZ4mtAIYomFg5dukEGtk5q7YrtYZrpopH5nixI9yjZyIevh4hr49TSFV9Q" width="300">
+<img src="https://res.wx.qq.com/op_res/ECwdFhkCwm6NE1c_jP-DOYaVaR8K_ORJeEzFlDW9eBJj8igF3yeut9KnoChxyqJ4ReJogCG9bL_qZ3OYdZBI0w" width="300">
 </div>
 
 ## 前端开发手册
@@ -271,4 +279,4 @@ $ npm run start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
 
 ## 项目 Star 数增长趋势
 
-[![Stargazers over time](https://starchart.cc/ykfe/ssr.svg)](https://starchart.cc/ykfe/ssr)
+[![Stargazers over time](https://starchart.cc/zhangyuang/ssr.svg)](https://starchart.cc/zhangyuang/ssr)

package/cjs/config/base.d.ts

@@ -1,3 +1,3 @@
 import * as WebpackChain from 'webpack-chain';
-declare const getBaseConfig: (chain: WebpackChain, isServer: boolean) => any;
+declare const getBaseConfig: (chain: WebpackChain, isServer: boolean) => IConfig;
 export { getBaseConfig };

package/cjs/entry/create-context.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="react" />
-import { IContext } from 'ssr-types-react';
-declare const STORE_CONTEXT: import("react").Context<IContext<any>>;
+declare let STORE_CONTEXT: any;
 export { STORE_CONTEXT };

package/cjs/entry/create-context.js

@@ -1,9 +1,20 @@
 "use strict";
+// @ts-nocheck
 // The file is provisional，don't depend on it
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.STORE_CONTEXT = void 0;
 const react_1 = require("react");
-const STORE_CONTEXT = (0, react_1.createContext)({
-    state: {}
-});
+let STORE_CONTEXT;
 exports.STORE_CONTEXT = STORE_CONTEXT;
+if (__isBrowser__) {
+    exports.STORE_CONTEXT = STORE_CONTEXT = (_a = window.STORE_CONTEXT) !== null && _a !== void 0 ? _a : (0, react_1.createContext)({
+        state: {}
+    });
+    window.STORE_CONTEXT = STORE_CONTEXT;
+}
+else {
+    exports.STORE_CONTEXT = STORE_CONTEXT = (0, react_1.createContext)({
+        state: {}
+    });
+}

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, { location: ctx.request.url },
+        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/base.d.ts

@@ -1,3 +1,3 @@
 import * as WebpackChain from 'webpack-chain';
-declare const getBaseConfig: (chain: WebpackChain, isServer: boolean) => any;
+declare const getBaseConfig: (chain: WebpackChain, isServer: boolean) => IConfig;
 export { getBaseConfig };

package/esm/entry/create-context.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="react" />
-import { IContext } from 'ssr-types-react';
-declare const STORE_CONTEXT: import("react").Context<IContext<any>>;
+declare let STORE_CONTEXT: any;
 export { STORE_CONTEXT };

package/esm/entry/create-context.js

@@ -1,6 +1,17 @@
+// @ts-nocheck
 // The file is provisional，don't depend on it
+var _a;
 import { createContext } from 'react';
-const STORE_CONTEXT = createContext({
-    state: {}
-});
+let STORE_CONTEXT;
+if (__isBrowser__) {
+    STORE_CONTEXT = (_a = window.STORE_CONTEXT) !== null && _a !== void 0 ? _a : createContext({
+        state: {}
+    });
+    window.STORE_CONTEXT = STORE_CONTEXT;
+}
+else {
+    STORE_CONTEXT = createContext({
+        state: {}
+    });
+}
 export { STORE_CONTEXT };

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, { location: ctx.request.url },
+        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.5",
+  "version": "6.1.9",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -13,7 +13,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ykfe/ssr.git"
+    "url": "git+https://github.com/zhangyuang/ssr.git"
   },
   "keywords": [
     "cli",
@@ -25,9 +25,9 @@
   "author": "zhangyuang",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/ykfe/ssr/issues"
+    "url": "https://github.com/zhangyuang/ssr/issues"
   },
-  "homepage": "https://github.com/ykfe/ssr#readme",
+  "homepage": "https://github.com/zhangyuang/ssr#readme",
   "dependencies": {
     "@babel/core": "^7.0.0",
     "@babel/plugin-transform-runtime": "^7.9.6",
@@ -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.4",
-    "ssr-server-utils": "^5.7.6",
-    "ssr-webpack": "^5.7.5",
+    "ssr-client-utils": "^5.6.40",
+    "ssr-hoc-react": "^6.0.7",
+    "ssr-server-utils": "^5.7.10",
+    "ssr-webpack": "^5.7.9",
     "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.6"
   },
-  "gitHead": "c2e1c178b48c4af589f9b75622c75092568481ef"
+  "gitHead": "d13f3be99541ee9bcc9694aed1f642531f2680e4"
 }

package/src/entry/create-context.ts

@@ -1,11 +1,20 @@
+// @ts-nocheck
 // The file is provisional，don't depend on it
 
 import { createContext } from 'react'
 import { IContext } from 'ssr-types-react'
 
-const STORE_CONTEXT = createContext<IContext>({
-  state: {}
-})
+let STORE_CONTEXT
+if (__isBrowser__) {
+  STORE_CONTEXT = window.STORE_CONTEXT ?? createContext<IContext>({
+    state: {}
+  })
+  window.STORE_CONTEXT = STORE_CONTEXT
+} else {
+  STORE_CONTEXT = createContext<IContext>({
+    state: {}
+  })
+}
 
 export {
   STORE_CONTEXT

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 location={ctx.request.url}>
+      <Context.Provider value={{ state: combineData }}>
+        <Layout ctx={ctx} config={config} staticList={staticList} injectState={injectState}>
+          {isCsr ? <></> : <Component />}
+        </Layout>
+      </Context.Provider>
+    </StaticRouter>
   )
 }