ssr-plugin-react 6.1.64 → 6.1.65

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.1.65](https://github.com/zhangyuang/ssr/compare/v6.1.62...v6.1.65) (2022-02-17)
+
+
+### Features
+
+* support combine declareRouter with manualRouter ([c2b5482](https://github.com/zhangyuang/ssr/commit/c2b548284f8683c266e6e858d6a9eb91cb72bc50))
+
+
+
+
+
 ## [6.1.64](https://github.com/zhangyuang/ssr/compare/v6.1.63...v6.1.64) (2022-02-15)
 
 **Note:** Version bump only for package ssr-plugin-react

package/README.md

@@ -271,7 +271,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/UQMlAGgJt38dZ0iX_udYYLvwceEOo5w6OAcZ5XodX_aMSZ_cpvCtpbfQaLGkPnDMoK0Rnbhgr7FjpQ8YUjaX-Q" width="300">
+<img src="https://res.wx.qq.com/op_res/yEMBkta89JhlC9RlNrTqXHshV4a6Wa-tBIBMZe9PjLoOJgtnLYjHQ4TQttfqJ4iYbqhSTEA4YI6TBWkO76-chA" width="300">
 </div>
 
 ## 前端开发手册

package/cjs/entry/client-entry.js

@@ -6,10 +6,9 @@ const ReactDOM = require("react-dom");
 const react_router_dom_1 = require("react-router-dom");
 const ssr_client_utils_1 = require("ssr-client-utils");
 const ssr_hoc_react_1 = require("ssr-hoc-react");
-// @ts-expect-error
-const Routes = require("_build/ssr-temporary-routes");
+const create_router_1 = require("./create-router");
 const context_1 = require("./context");
-const { FeRoutes, layoutFetch, App, PrefixRouterBase } = Routes;
+const { FeRoutes, layoutFetch, App, PrefixRouterBase } = create_router_1.Routes;
 const clientRender = async () => {
     var _a, _b, _c;
     const IApp = App !== null && App !== void 0 ? App : function (props) {

package/cjs/entry/context.js

@@ -5,9 +5,8 @@ const React = require("react");
 const react_1 = require("react");
 // @ts-expect-error
 const create_context_1 = require("_build/create-context");
-// @ts-expect-error
-const Routes = require("_build/ssr-temporary-routes");
-const { reducer, state } = Routes;
+const create_router_1 = require("./create-router");
+const { reducer, state } = create_router_1.Routes;
 const userState = state !== null && state !== void 0 ? state : {};
 const userReducer = reducer !== null && reducer !== void 0 ? reducer : function () { };
 const isDev = process.env.NODE_ENV !== 'production';

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

@@ -0,0 +1,3 @@
+import { ReactRoutesType } from 'ssr-types-react';
+declare const Routes: ReactRoutesType;
+export { Routes };

package/cjs/entry/create-router.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Routes = void 0;
+// @ts-expect-error
+const declareRoutes = require("_build/ssr-temporary-routes");
+// @ts-expect-error
+const ManualRoutes = require("_build/ssr-manual-routes");
+const declareRoutesWithType = declareRoutes;
+const ManualRoutesWithType = ManualRoutes;
+const Routes = {
+    ...declareRoutes,
+    ...ManualRoutesWithType
+};
+exports.Routes = Routes;
+if (ManualRoutesWithType.FeRoutes) {
+    // 如果存在相同 path，取声明式路由为最高优先级
+    const combineRoutes = declareRoutesWithType.FeRoutes.map(route => {
+        const found = ManualRoutesWithType.FeRoutes.find(e => e.path === route.path);
+        return found !== null && found !== void 0 ? found : route;
+    });
+    declareRoutesWithType.FeRoutes.forEach(route => {
+        // 补充声明式路由新增的配置
+        const found = combineRoutes.find(e => e.path === route.path);
+        if (!found) {
+            combineRoutes.push(route);
+        }
+    });
+    Routes.FeRoutes = combineRoutes;
+}

package/cjs/entry/server-entry.js

@@ -7,12 +7,11 @@ const ssr_server_utils_1 = require("ssr-server-utils");
 // @ts-expect-error
 const serializeWrap = require("serialize-javascript");
 // @ts-expect-error
-const Routes = require("_build/ssr-temporary-routes");
-// @ts-expect-error
 const create_context_1 = require("_build/create-context");
 // @ts-expect-error
 const index_tsx_1 = require("@/components/layout/index.tsx");
-const { FeRoutes, layoutFetch, PrefixRouterBase, state } = Routes;
+const create_router_1 = require("./create-router");
+const { FeRoutes, layoutFetch, PrefixRouterBase, state } = create_router_1.Routes;
 const serialize = serializeWrap.default || serializeWrap;
 const serverRender = async (ctx, config) => {
     var _a;

package/esm/entry/client-entry.js

@@ -3,8 +3,7 @@ import * as ReactDOM from 'react-dom';
 import { BrowserRouter, Route, Switch } from 'react-router-dom';
 import { preloadComponent } from 'ssr-client-utils';
 import { wrapComponent } from 'ssr-hoc-react';
-// @ts-expect-error
-import * as Routes from '_build/ssr-temporary-routes';
+import { Routes } from './create-router';
 import { AppContext } from './context';
 const { FeRoutes, layoutFetch, App, PrefixRouterBase } = Routes;
 const clientRender = async () => {

package/esm/entry/context.js

@@ -2,8 +2,7 @@ import * as React from 'react';
 import { useReducer } from 'react';
 // @ts-expect-error
 import { STORE_CONTEXT } from '_build/create-context';
-// @ts-expect-error
-import * as Routes from '_build/ssr-temporary-routes';
+import { Routes } from './create-router';
 const { reducer, state } = Routes;
 const userState = state !== null && state !== void 0 ? state : {};
 const userReducer = reducer !== null && reducer !== void 0 ? reducer : function () { };

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

@@ -0,0 +1,3 @@
+import { ReactRoutesType } from 'ssr-types-react';
+declare const Routes: ReactRoutesType;
+export { Routes };

package/esm/entry/create-router.js

@@ -0,0 +1,26 @@
+// @ts-expect-error
+import * as declareRoutes from '_build/ssr-temporary-routes';
+// @ts-expect-error
+import * as ManualRoutes from '_build/ssr-manual-routes';
+const declareRoutesWithType = declareRoutes;
+const ManualRoutesWithType = ManualRoutes;
+const Routes = {
+    ...declareRoutes,
+    ...ManualRoutesWithType
+};
+if (ManualRoutesWithType.FeRoutes) {
+    // 如果存在相同 path，取声明式路由为最高优先级
+    const combineRoutes = declareRoutesWithType.FeRoutes.map(route => {
+        const found = ManualRoutesWithType.FeRoutes.find(e => e.path === route.path);
+        return found !== null && found !== void 0 ? found : route;
+    });
+    declareRoutesWithType.FeRoutes.forEach(route => {
+        // 补充声明式路由新增的配置
+        const found = combineRoutes.find(e => e.path === route.path);
+        if (!found) {
+            combineRoutes.push(route);
+        }
+    });
+    Routes.FeRoutes = combineRoutes;
+}
+export { Routes };

package/esm/entry/server-entry.js

@@ -4,11 +4,10 @@ import { findRoute, getManifest, logGreen, normalizePath, addAsyncChunk } from '
 // @ts-expect-error
 import * as serializeWrap from 'serialize-javascript';
 // @ts-expect-error
-import * as Routes from '_build/ssr-temporary-routes';
-// @ts-expect-error
 import { STORE_CONTEXT as Context } from '_build/create-context';
 // @ts-expect-error
 import Layout from '@/components/layout/index.tsx';
+import { Routes } from './create-router';
 const { FeRoutes, layoutFetch, PrefixRouterBase, state } = Routes;
 const serialize = serializeWrap.default || serializeWrap;
 const serverRender = async (ctx, config) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.1.64",
+  "version": "6.1.65",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -56,9 +56,9 @@
     "react-dev-utils": "^11.0.4",
     "serialize-javascript": "^6.0.0",
     "ssr-client-utils": "^6.1.62",
-    "ssr-hoc-react": "^6.1.64",
-    "ssr-server-utils": "^6.1.59",
-    "ssr-webpack": "^6.1.62",
+    "ssr-hoc-react": "^6.1.65",
+    "ssr-server-utils": "^6.1.65",
+    "ssr-webpack": "^6.1.65",
     "terser-webpack-plugin": "^2.3.5",
     "url-loader": "^4.1.1",
     "vite": "^2.7.0",
@@ -76,5 +76,5 @@
     "concurrently": "^5.1.0",
     "ssr-types-react": "^6.1.62"
   },
-  "gitHead": "90b805e481833cc0d8ff967ffbd2991ad6b9fecc"
+  "gitHead": "21a0f367b85a4aaab35fc35465ee62facaf2ff16"
 }

package/src/entry/client-entry.tsx

@@ -4,8 +4,7 @@ import { BrowserRouter, Route, Switch } from 'react-router-dom'
 import { preloadComponent } from 'ssr-client-utils'
 import { wrapComponent } from 'ssr-hoc-react'
 import { IWindow, LayoutProps, ReactESMFeRouteItem, ReactRoutesType } from 'ssr-types-react'
-// @ts-expect-error
-import * as Routes from '_build/ssr-temporary-routes'
+import { Routes } from './create-router'
 import { AppContext } from './context'
 
 const { FeRoutes, layoutFetch, App, PrefixRouterBase } = Routes as ReactRoutesType

package/src/entry/context.tsx

@@ -4,8 +4,7 @@ import { IProps, Action, IWindow, ReactRoutesType } from 'ssr-types-react'
 
 // @ts-expect-error
 import { STORE_CONTEXT } from '_build/create-context'
-// @ts-expect-error
-import * as Routes from '_build/ssr-temporary-routes'
+import { Routes } from './create-router'
 
 const { reducer, state } = Routes as ReactRoutesType
 

package/src/entry/create-router.ts

@@ -0,0 +1,31 @@
+// @ts-expect-error
+import * as declareRoutes from '_build/ssr-temporary-routes'
+// @ts-expect-error
+import * as ManualRoutes from '_build/ssr-manual-routes'
+import { ReactRoutesType } from 'ssr-types-react'
+
+const declareRoutesWithType = declareRoutes as ReactRoutesType
+const ManualRoutesWithType = ManualRoutes as ReactRoutesType
+
+const Routes: ReactRoutesType = {
+  ...declareRoutes,
+  ...ManualRoutesWithType
+}
+if (ManualRoutesWithType.FeRoutes) {
+  // 如果存在相同 path，取声明式路由为最高优先级
+  const combineRoutes = declareRoutesWithType.FeRoutes.map(route => {
+    const found = ManualRoutesWithType.FeRoutes.find(e => e.path === route.path)
+    return found ?? route
+  })
+  declareRoutesWithType.FeRoutes.forEach(route => {
+    // 补充声明式路由新增的配置
+    const found = combineRoutes.find(e => e.path === route.path)
+    if (!found) {
+      combineRoutes.push(route)
+    }
+  })
+  Routes.FeRoutes = combineRoutes
+}
+export {
+  Routes
+}

package/src/entry/server-entry.tsx

@@ -5,11 +5,10 @@ import { ISSRContext, IConfig, ReactRoutesType, ReactESMFeRouteItem } from 'ssr-
 // @ts-expect-error
 import * as serializeWrap from 'serialize-javascript'
 // @ts-expect-error
-import * as Routes from '_build/ssr-temporary-routes'
-// @ts-expect-error
 import { STORE_CONTEXT as Context } from '_build/create-context'
 // @ts-expect-error
 import Layout from '@/components/layout/index.tsx'
+import { Routes } from './create-router'
 
 const { FeRoutes, layoutFetch, PrefixRouterBase, state } = Routes as ReactRoutesType
 const serialize = serializeWrap.default || serializeWrap