ssr-plugin-react 5.6.26 → 5.6.31

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.6.31](https://github.com/ykfe/ssr/compare/v5.6.30...v5.6.31) (2021-10-21)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
+## [5.6.27](https://github.com/ykfe/ssr/compare/v5.6.26...v5.6.27) (2021-10-14)
+
+
+### Bug Fixes
+
+* queryString annotation ([#121](https://github.com/ykfe/ssr/issues/121)) ([b939ca9](https://github.com/ykfe/ssr/commit/b939ca9dfce93c297a5408c87af0617985a55cd1))
+
+
+
+
+
 ## [5.6.26](https://github.com/ykfe/ssr/compare/v5.6.25...v5.6.26) (2021-09-29)
 
 **Note:** Version bump only for package ssr-plugin-react

package/README.md

@@ -100,6 +100,9 @@
 <td align="center" style="height: 100px"><a href="https://m.film.qq.com/x/tva-vip-center/" target="_blank"><img src="https://res.wx.qq.com/op_res/x7sWI9AfUK1QwH0EDhKp4e_bGWxYOQ_1RlZqBFy9JntJzaE4aRzNhVgmxLNloAFpSQ-mBr9X9pux3QlV9QHHvQ" width="200px;margin: 20px 0" alt="腾讯视频"/><br />
 <a href="https://m.film.qq.com/x/tva-vip-center/" target="_bvlank"><b>腾讯视频
 </b></a></td>
+<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>
 </tr>
 </table>
 
@@ -255,8 +258,8 @@ $ npm run start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
 欢迎直接扫码加入钉钉群或者微信群
 
 <div style="display:flex">
-<img src="https://res.wx.qq.com/op_res/rrhdxU0o2yUdgTjwgkAgO-CSFV-lArvMYzWzxl2SuvnKkcWECv7SXswEYjk2pPcDcL43r0kz_MIp_fsxPPqQ2Q" width="300">
-<img src="https://res.wx.qq.com/op_res/vN-ex83t0SUwJWJ_2W2zTkiMcHa7jFeweuROktahorwwGJouTfPAoDeI2TLu1dloWe0oxDQ2O4GAzwqNxiqtlA" width="300">
+<img src="https://res.wx.qq.com/op_res/7F1t4Z8yCHWilehbcFGjAj0yVn0URMiWBGVJa-TVu_eqw5IwUXA2kPYBnfX6YRHy0FVBB-yC6l0IEL02QTJkLg" width="300">
+<img src="https://res.wx.qq.com/op_res/e7Z2b52xu-o9gaw-FgTmM8w-ohj_vFoDwC9JFl7N3o4c5oThkJ1plMT4D2GrC0rheo5mu5pkgHSw6s-Z8UZhvg" width="300">
 </div>
 
 ## 前端开发手册

package/cjs/config/base.js

@@ -83,7 +83,7 @@ const getBaseConfig = (chain, isServer) => {
         .rule('compileBabel')
         .test(/\.(js|mjs|jsx|ts|tsx)$/)
         .exclude
-        .add(/node_modules/)
+        .add(/node_modules|core-js/)
         .end();
     const module = chain.module
         .rule('compileBabelForExtraModule')

package/cjs/entry/client-entry.js

@@ -9,15 +9,16 @@ const ssr_hoc_react_1 = require("ssr-hoc-react");
 // @ts-expect-error
 const Routes = require("_build/ssr-temporary-routes");
 const context_1 = require("./context");
-const { FeRoutes, layoutFetch, App, BASE_NAME } = Routes;
+const { FeRoutes, layoutFetch, App, PrefixRouterBase } = Routes;
 const clientRender = async () => {
-    var _a, _b;
+    var _a, _b, _c;
     const IApp = App !== null && App !== void 0 ? App : function (props) {
         return props.children;
     };
     // 客户端渲染||hydrate
-    const routes = await (0, ssr_client_utils_1.preloadComponent)(FeRoutes, BASE_NAME);
-    ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](React.createElement(react_router_dom_1.BrowserRouter, { basename: BASE_NAME },
+    const baseName = (_a = window.prefix) !== null && _a !== void 0 ? _a : 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,
             React.createElement(react_router_dom_1.Switch, null,
                 React.createElement(IApp, null,
@@ -31,7 +32,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__) {
-        (_b = (_a = module === null || module === void 0 ? void 0 : module.hot) === null || _a === void 0 ? void 0 : _a.accept) === null || _b === void 0 ? void 0 : _b.call(_a); // webpack 场景下的 hmr
+        (_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
     }
 };
 exports.clientRender = clientRender;

package/cjs/entry/create-context.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clientContext = exports.serverContext = void 0;
 const react_1 = require("react");
-// 服务端需要为每一个请求创建全新的 contetx 方式请求污染
+// 服务端需要为每一个请求创建全新的 context 防止请求污染
 const serverContext = (context) => {
     return (0, react_1.createContext)(context);
 };

package/cjs/entry/server-entry.js

@@ -10,14 +10,15 @@ const Routes = require("_build/ssr-temporary-routes");
 const create_context_1 = require("./create-context");
 // @ts-expect-error
 const index_tsx_1 = require("@/components/layout/index.tsx");
-const { FeRoutes, layoutFetch, BASE_NAME, state } = Routes;
+const { FeRoutes, layoutFetch, PrefixRouterBase, state } = Routes;
 const serverRender = async (ctx, config) => {
     var _a, _b;
-    const { cssOrder, jsOrder, dynamic, mode, chunkName, parallelFetch, disableClientRender } = config;
+    const { cssOrder, jsOrder, dynamic, mode, chunkName, parallelFetch, disableClientRender, prefix } = config;
     global.window = (_a = global.window) !== null && _a !== void 0 ? _a : {}; // 防止覆盖上层应用自己定义的 window 对象
-    let path = ctx.request.path; // 这里取 pathname 不能够包含 queyString
-    if (BASE_NAME) {
-        path = (0, ssr_server_utils_1.normalizePath)(path);
+    let path = ctx.request.path; // 这里取 pathname 不能够包含 queryString
+    const base = prefix !== null && prefix !== void 0 ? prefix : PrefixRouterBase; // 以开发者实际传入的为最高优先级
+    if (base) {
+        path = (0, ssr_server_utils_1.normalizePath)(path, base);
     }
     const { window } = global;
     const routeItem = (0, ssr_server_utils_1.findRoute)(FeRoutes, path);

package/esm/config/base.js

@@ -80,7 +80,7 @@ const getBaseConfig = (chain, isServer) => {
         .rule('compileBabel')
         .test(/\.(js|mjs|jsx|ts|tsx)$/)
         .exclude
-        .add(/node_modules/)
+        .add(/node_modules|core-js/)
         .end();
     const module = chain.module
         .rule('compileBabelForExtraModule')

package/esm/entry/client-entry.js

@@ -6,15 +6,16 @@ import { wrapComponent } from 'ssr-hoc-react';
 // @ts-expect-error
 import * as Routes from '_build/ssr-temporary-routes';
 import { AppContext } from './context';
-const { FeRoutes, layoutFetch, App, BASE_NAME } = Routes;
+const { FeRoutes, layoutFetch, App, PrefixRouterBase } = Routes;
 const clientRender = async () => {
-    var _a, _b;
+    var _a, _b, _c;
     const IApp = App !== null && App !== void 0 ? App : function (props) {
         return props.children;
     };
     // 客户端渲染||hydrate
-    const routes = await preloadComponent(FeRoutes, BASE_NAME);
-    ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](React.createElement(BrowserRouter, { basename: BASE_NAME },
+    const baseName = (_a = window.prefix) !== null && _a !== void 0 ? _a : PrefixRouterBase;
+    const routes = await preloadComponent(FeRoutes, baseName);
+    ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](React.createElement(BrowserRouter, { basename: baseName },
         React.createElement(AppContext, null,
             React.createElement(Switch, null,
                 React.createElement(IApp, null,
@@ -28,7 +29,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__) {
-        (_b = (_a = module === null || module === void 0 ? void 0 : module.hot) === null || _a === void 0 ? void 0 : _a.accept) === null || _b === void 0 ? void 0 : _b.call(_a); // webpack 场景下的 hmr
+        (_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
     }
 };
 if (!window.__disableClientRender__) {

package/esm/entry/create-context.js

@@ -1,5 +1,5 @@
 import { createContext } from 'react';
-// 服务端需要为每一个请求创建全新的 contetx 方式请求污染
+// 服务端需要为每一个请求创建全新的 context 防止请求污染
 const serverContext = (context) => {
     return createContext(context);
 };

package/esm/entry/server-entry.js

@@ -7,14 +7,15 @@ import * as Routes from '_build/ssr-temporary-routes';
 import { serverContext } from './create-context';
 // @ts-expect-error
 import Layout from '@/components/layout/index.tsx';
-const { FeRoutes, layoutFetch, BASE_NAME, state } = Routes;
+const { FeRoutes, layoutFetch, PrefixRouterBase, state } = Routes;
 const serverRender = async (ctx, config) => {
     var _a, _b;
-    const { cssOrder, jsOrder, dynamic, mode, chunkName, parallelFetch, disableClientRender } = config;
+    const { cssOrder, jsOrder, dynamic, mode, chunkName, parallelFetch, disableClientRender, prefix } = config;
     global.window = (_a = global.window) !== null && _a !== void 0 ? _a : {}; // 防止覆盖上层应用自己定义的 window 对象
-    let path = ctx.request.path; // 这里取 pathname 不能够包含 queyString
-    if (BASE_NAME) {
-        path = normalizePath(path);
+    let path = ctx.request.path; // 这里取 pathname 不能够包含 queryString
+    const base = prefix !== null && prefix !== void 0 ? prefix : PrefixRouterBase; // 以开发者实际传入的为最高优先级
+    if (base) {
+        path = normalizePath(path, base);
     }
     const { window } = global;
     const routeItem = findRoute(FeRoutes, path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "5.6.26",
+  "version": "5.6.31",
   "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.26",
-    "ssr-hoc-react": "^5.6.24",
-    "ssr-server-utils": "^5.6.26",
-    "ssr-webpack": "^5.6.26",
+    "ssr-client-utils": "^5.6.28",
+    "ssr-hoc-react": "^5.6.29",
+    "ssr-server-utils": "^5.6.28",
+    "ssr-webpack": "^5.6.28",
     "terser-webpack-plugin": "^2.3.5",
     "url-loader": "1.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": "^5.6.24"
+    "ssr-types-react": "^5.6.29"
   },
-  "gitHead": "3824801e667480f6f0298d57b9240b629d3c0ff2"
+  "gitHead": "8da1715438cebeae99cfa30355a1563e1823a0d9"
 }

package/src/config/base.ts

@@ -88,7 +88,7 @@ const getBaseConfig = (chain: WebpackChain, isServer: boolean) => {
     .rule('compileBabel')
     .test(/\.(js|mjs|jsx|ts|tsx)$/)
     .exclude
-    .add(/node_modules/)
+    .add(/node_modules|core-js/)
     .end()
 
   const module = chain.module

package/src/entry/client-entry.tsx

@@ -8,7 +8,7 @@ import { IWindow, LayoutProps, ReactClientESMFeRouteItem, ReactClientRoutesType
 import * as Routes from '_build/ssr-temporary-routes'
 import { AppContext } from './context'
 
-const { FeRoutes, layoutFetch, App, BASE_NAME } = Routes as ReactClientRoutesType
+const { FeRoutes, layoutFetch, App, PrefixRouterBase } = Routes as ReactClientRoutesType
 
 declare const module: any
 declare const window: IWindow
@@ -18,9 +18,10 @@ const clientRender = async (): Promise<void> => {
     return props.children!
   }
   // 客户端渲染||hydrate
-  const routes = await preloadComponent(FeRoutes, BASE_NAME)
+  const baseName = window.prefix ?? PrefixRouterBase
+  const routes = await preloadComponent(FeRoutes, baseName)
   ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](
-    <BrowserRouter basename={BASE_NAME}>
+    <BrowserRouter basename={baseName}>
       <AppContext>
         <Switch>
           <IApp>

package/src/entry/create-context.ts

@@ -1,7 +1,7 @@
 import { createContext } from 'react'
 import { IContext } from 'ssr-types-react'
 
-// 服务端需要为每一个请求创建全新的 contetx 方式请求污染
+// 服务端需要为每一个请求创建全新的 context 防止请求污染
 const serverContext = (context?: any) => {
   return createContext(context)
 }

package/src/entry/server-entry.tsx

@@ -9,16 +9,17 @@ import { serverContext } from './create-context'
 // @ts-expect-error
 import Layout from '@/components/layout/index.tsx'
 
-const { FeRoutes, layoutFetch, BASE_NAME, state } = Routes as ReactRoutesType
+const { FeRoutes, layoutFetch, PrefixRouterBase, state } = Routes as ReactRoutesType
 
 declare const global: IGlobal
 
 const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.ReactElement> => {
-  const { cssOrder, jsOrder, dynamic, mode, chunkName, parallelFetch, disableClientRender } = config
+  const { cssOrder, jsOrder, dynamic, mode, chunkName, parallelFetch, disableClientRender, prefix } = config
   global.window = global.window ?? {} // 防止覆盖上层应用自己定义的 window 对象
-  let path = ctx.request.path // 这里取 pathname 不能够包含 queyString
-  if (BASE_NAME) {
-    path = normalizePath(path)
+  let path = ctx.request.path // 这里取 pathname 不能够包含 queryString
+  const base = prefix ?? PrefixRouterBase // 以开发者实际传入的为最高优先级
+  if (base) {
+    path = normalizePath(path, base)
   }
   const { window } = global
   const routeItem = findRoute<ReactServerESMFeRouteItem>(FeRoutes, path)