ssr-plugin-react 6.1.65 → 6.1.68

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.1.68](https://github.com/zhangyuang/ssr/compare/v6.1.67...v6.1.68) (2022-03-04)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
+## [6.1.67](https://github.com/zhangyuang/ssr/compare/v6.1.66...v6.1.67) (2022-02-18)
+
+
+### Features
+
+* transform route.ts by esbuild ([1719168](https://github.com/zhangyuang/ssr/commit/17191687db5dc6805b5bbcf5dcd8f80d8d29bbde))
+
+
+
+
+
+## [6.1.66](https://github.com/zhangyuang/ssr/compare/v6.1.65...v6.1.66) (2022-02-18)
+
+
+### Bug Fixes
+
+* create-router ([ee9c3fa](https://github.com/zhangyuang/ssr/commit/ee9c3fa5fe14f8e324edcf5da64bf1dd8e041891))
+
+
+
+
+
 ## [6.1.65](https://github.com/zhangyuang/ssr/compare/v6.1.62...v6.1.65) (2022-02-17)
 
 

package/README.md

@@ -188,7 +188,7 @@ $ npm run build # 资源构建，等价于 npx ssr build
 $ npm run start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
 ```
 
-![](http://doc.ssr-fc.com/images/resume3.svg)
+![](http://doc.ssr-fc.com/images/start-vite2.gif)
 
 ## 线上案例
 
@@ -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/yEMBkta89JhlC9RlNrTqXHshV4a6Wa-tBIBMZe9PjLoOJgtnLYjHQ4TQttfqJ4iYbqhSTEA4YI6TBWkO76-chA" width="300">
+<img src="https://res.wx.qq.com/op_res/QAMR2cMecWSBwvxF-zDR9Rt2TfALiULQ5SQbagHYpceeisESp-BCPUwEX9N8Ty2Xu6sGSHrU6PCJyaL7-Ry1Qw" width="300">
 </div>
 
 ## 前端开发手册

package/cjs/entry/create-router.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Routes = void 0;
 // @ts-expect-error
-const declareRoutes = require("_build/ssr-temporary-routes");
+const declareRoutes = require("_build/ssr-declare-routes");
 // @ts-expect-error
 const ManualRoutes = require("_build/ssr-manual-routes");
 const declareRoutesWithType = declareRoutes;
@@ -13,12 +13,9 @@ const Routes = {
 };
 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 => {
+    // 声明式路由覆盖约定式路由同名path
+    const combineRoutes = declareRoutesWithType.FeRoutes.map(route => { var _a; return (_a = ManualRoutesWithType.FeRoutes.find(e => e.path === route.path)) !== null && _a !== void 0 ? _a : route; });
+    ManualRoutesWithType.FeRoutes.forEach(route => {
         // 补充声明式路由新增的配置
         const found = combineRoutes.find(e => e.path === route.path);
         if (!found) {

package/cjs/tools/vite.js

@@ -42,12 +42,12 @@ const serverConfig = {
     build: {
         ssr: reactServerEntry,
         outDir: serverOutPut,
-        rollupOptions: Object.assign(isDev ? { input: reactClientEntry } : {}, // setting prebundle list by client-entry in dev
-        {
+        rollupOptions: {
+            input: isDev ? reactClientEntry : reactServerEntry,
             output: {
                 entryFileNames: 'Page.server.js'
             }
-        })
+        }
     },
     define: {
         __isBrowser__: false,

package/esm/entry/create-router.js

@@ -1,5 +1,5 @@
 // @ts-expect-error
-import * as declareRoutes from '_build/ssr-temporary-routes';
+import * as declareRoutes from '_build/ssr-declare-routes';
 // @ts-expect-error
 import * as ManualRoutes from '_build/ssr-manual-routes';
 const declareRoutesWithType = declareRoutes;
@@ -9,12 +9,9 @@ const Routes = {
     ...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 => {
+    // 声明式路由覆盖约定式路由同名path
+    const combineRoutes = declareRoutesWithType.FeRoutes.map(route => { var _a; return (_a = ManualRoutesWithType.FeRoutes.find(e => e.path === route.path)) !== null && _a !== void 0 ? _a : route; });
+    ManualRoutesWithType.FeRoutes.forEach(route => {
         // 补充声明式路由新增的配置
         const found = combineRoutes.find(e => e.path === route.path);
         if (!found) {

package/esm/tools/vite.js

@@ -39,12 +39,12 @@ const serverConfig = {
     build: {
         ssr: reactServerEntry,
         outDir: serverOutPut,
-        rollupOptions: Object.assign(isDev ? { input: reactClientEntry } : {}, // setting prebundle list by client-entry in dev
-        {
+        rollupOptions: {
+            input: isDev ? reactClientEntry : reactServerEntry,
             output: {
                 entryFileNames: 'Page.server.js'
             }
-        })
+        }
     },
     define: {
         __isBrowser__: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.1.65",
+  "version": "6.1.68",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -55,10 +55,10 @@
     "postcss-safe-parser": "4.0.1",
     "react-dev-utils": "^11.0.4",
     "serialize-javascript": "^6.0.0",
-    "ssr-client-utils": "^6.1.62",
-    "ssr-hoc-react": "^6.1.65",
-    "ssr-server-utils": "^6.1.65",
-    "ssr-webpack": "^6.1.65",
+    "ssr-client-utils": "^6.1.68",
+    "ssr-hoc-react": "^6.1.68",
+    "ssr-server-utils": "^6.1.68",
+    "ssr-webpack": "^6.1.68",
     "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.1.62"
+    "ssr-types-react": "^6.1.68"
   },
-  "gitHead": "21a0f367b85a4aaab35fc35465ee62facaf2ff16"
+  "gitHead": "8d25fd2e480f1e6477ee3ec51f1c082a017099e8"
 }

package/src/entry/create-router.ts

@@ -1,5 +1,5 @@
 // @ts-expect-error
-import * as declareRoutes from '_build/ssr-temporary-routes'
+import * as declareRoutes from '_build/ssr-declare-routes'
 // @ts-expect-error
 import * as ManualRoutes from '_build/ssr-manual-routes'
 import { ReactRoutesType } from 'ssr-types-react'
@@ -12,12 +12,9 @@ const Routes: ReactRoutesType = {
   ...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 => {
+  // 声明式路由覆盖约定式路由同名path
+  const combineRoutes = declareRoutesWithType.FeRoutes.map(route => ManualRoutesWithType.FeRoutes.find(e => e.path === route.path) ?? route)
+  ManualRoutesWithType.FeRoutes.forEach(route => {
     // 补充声明式路由新增的配置
     const found = combineRoutes.find(e => e.path === route.path)
     if (!found) {

package/src/tools/vite.ts

@@ -40,14 +40,12 @@ const serverConfig: UserConfig = {
   build: {
     ssr: reactServerEntry,
     outDir: serverOutPut,
-    rollupOptions: Object.assign(
-      isDev ? { input: reactClientEntry } : {}, // setting prebundle list by client-entry in dev
-      {
-        output: {
-          entryFileNames: 'Page.server.js'
-        }
+    rollupOptions: {
+      input: isDev ? reactClientEntry : reactServerEntry, // setting prebundle list by client-entry in dev
+      output: {
+        entryFileNames: 'Page.server.js'
       }
-    )
+    }
   },
   define: {
     __isBrowser__: false,