From 08aa7b09cb447ffc4d621871dd775891b039048c Mon Sep 17 00:00:00 2001
From: harrywan <harrywan@webank.com>
Date: Tue, 25 May 2021 16:25:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(plugin-qiankun):=20=E5=BD=93=E5=AD=90?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=8D=95=E7=8B=AC=E8=BF=90=E8=A1=8C=E6=97=B6?=
 =?UTF-8?q?,=E4=B8=8D=E6=89=A7=E8=A1=8Cqiankun=E9=92=A9=E5=AD=90=E5=92=8C?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9Bqiankun=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../examples/app1/src/app.js                  | 19 ++++++++++
 .../examples/app1/src/pages/app1/test.vue     |  4 +-
 .../examples/main/src/pages/index.vue         |  2 +-
 .../src/micro/runtime/lifecycles.tpl          | 37 ++++++++++---------
 4 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/packages/fes-plugin-qiankun/examples/app1/src/app.js b/packages/fes-plugin-qiankun/examples/app1/src/app.js
index 5d609f81..02d3cb29 100644
--- a/packages/fes-plugin-qiankun/examples/app1/src/app.js
+++ b/packages/fes-plugin-qiankun/examples/app1/src/app.js
@@ -10,3 +10,22 @@ export const beforeRender = {
         });
     }
 };
+
+export const qiankun = {
+    // 应用加载之前
+    async bootstrap(props) {
+        console.log('app1 bootstrap', props);
+    },
+    // 应用 render 之前触发
+    async mount(props) {
+        console.log('app1 mount', props);
+    },
+    // 当 props 更新时触发
+    async update(props) {
+        console.log('app1 update', props);
+    },
+    // 应用卸载之后触发
+    async unmount(props) {
+        console.log('app1 unmount', props);
+    }
+};
diff --git a/packages/fes-plugin-qiankun/examples/app1/src/pages/app1/test.vue b/packages/fes-plugin-qiankun/examples/app1/src/pages/app1/test.vue
index c77c3a19..f20e10fd 100644
--- a/packages/fes-plugin-qiankun/examples/app1/src/pages/app1/test.vue
+++ b/packages/fes-plugin-qiankun/examples/app1/src/pages/app1/test.vue
@@ -5,8 +5,8 @@
 </template>
 <config>
 {
-    "name": "index",
-    "title": "home"
+    "name": "test",
+    "title": "test"
 }
 </config>
 <script>
diff --git a/packages/fes-plugin-qiankun/examples/main/src/pages/index.vue b/packages/fes-plugin-qiankun/examples/main/src/pages/index.vue
index 1ac39714..38cf4039 100644
--- a/packages/fes-plugin-qiankun/examples/main/src/pages/index.vue
+++ b/packages/fes-plugin-qiankun/examples/main/src/pages/index.vue
@@ -2,7 +2,7 @@
     <div>
         main
         <a-tabs v-model:activeKey="activeKey">
-            <a-tab-pane key="1" tab="Tab 1"> <MicroAppWithMemoHistory key="1" name="app1" url="/app1" /></a-tab-pane>
+            <a-tab-pane key="1" tab="Tab 1"><MicroAppWithMemoHistory key="1" name="app1" url="/app1" /></a-tab-pane>
             <a-tab-pane key="2" tab="Tab 2"><MicroAppWithMemoHistory key="2" name="app1" url="/app1/test" /></a-tab-pane>
             <a-tab-pane key="3" tab="Tab 3">Content of Tab Pane 3</a-tab-pane>
         </a-tabs>
diff --git a/packages/fes-plugin-qiankun/src/micro/runtime/lifecycles.tpl b/packages/fes-plugin-qiankun/src/micro/runtime/lifecycles.tpl
index 807ce787..508334e2 100644
--- a/packages/fes-plugin-qiankun/src/micro/runtime/lifecycles.tpl
+++ b/packages/fes-plugin-qiankun/src/micro/runtime/lifecycles.tpl
@@ -38,9 +38,11 @@ function getSlaveRuntime() {
 // 子应用生命周期钩子Bootstrap
 export function genBootstrap(oldRender, appPromise) {
     return async (props) => {
-        const slaveRuntime = getSlaveRuntime();
-        if (slaveRuntime.bootstrap) {
-            await slaveRuntime.bootstrap(props);
+        if (typeof props !== 'undefined') {
+            const slaveRuntime = getSlaveRuntime();
+            if (slaveRuntime.bootstrap) {
+                await slaveRuntime.bootstrap(props);
+            }
         }
         render = oldRender;
         if (isPromise(appPromise)) {
@@ -61,23 +63,22 @@ export function genMount(mountElementId) {
             if (slaveRuntime.mount) {
                 await slaveRuntime.mount(props);
             }
-        }
+             // 更新 clientRender 配置
+            const clientRenderOpts = {
+                // 支持通过 props 注入 container 来限定子应用 mountElementId 的查找范围
+                // 避免多个子应用出现在同一主应用时出现 mount 冲突
+                rootElement:
+                    props?.container?.querySelector(mountElementId) || mountElementId
+            };
 
-        // 更新 clientRender 配置
-        const clientRenderOpts = {
-            // 支持通过 props 注入 container 来限定子应用 mountElementId 的查找范围
-            // 避免多个子应用出现在同一主应用时出现 mount 冲突
-            rootElement:
-                props?.container?.querySelector(mountElementId) || mountElementId
-        };
+            clientRenderOptsStack.push(clientRenderOpts);
 
-        clientRenderOptsStack.push(clientRenderOpts);
-
-        if(props.url){
-            history.url = props.url || '/';
-        }
-        if(props.onRouterInit){
-            history.onRouterInit = props.onRouterInit;
+            if(props.url){
+                history.url = props.url || '/';
+            }
+            if(props.onRouterInit){
+                history.onRouterInit = props.onRouterInit;
+            }
         }
 
         // 第一次 mount 会自动触发 render，非第一次 mount 则需手动触发

From f5d6d16cfb7ccaee56d673f61c25d46823614820 Mon Sep 17 00:00:00 2001
From: harrywan <harrywan@webank.com>
Date: Tue, 25 May 2021 16:27:23 +0800
Subject: [PATCH 2/3] chore(release): publish

---
 lerna.json                                | 2 +-
 packages/create-fes-app/package.json      | 2 +-
 packages/fes-plugin-qiankun/package.json  | 2 +-
 packages/fes-plugin-request/package.json  | 4 ++--
 packages/fes-preset-built-in/package.json | 4 ++--
 packages/fes/package.json                 | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lerna.json b/lerna.json
index 742aacd8..766a428c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0-rc.25",
+  "version": "2.0.0-rc.26",
   "changelog": {
     "repo": "WeBankFinTech/fes.js",
     "cacheDir": ".changelog",
diff --git a/packages/create-fes-app/package.json b/packages/create-fes-app/package.json
index 76e54432..851f77a2 100644
--- a/packages/create-fes-app/package.json
+++ b/packages/create-fes-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fesjs/create-fes-app",
-  "version": "2.0.0-rc.23",
+  "version": "2.0.0-rc.26",
   "description": "create a app base on fes.js",
   "main": "lib/index.js",
   "files": [
diff --git a/packages/fes-plugin-qiankun/package.json b/packages/fes-plugin-qiankun/package.json
index a97082b7..b77632ef 100644
--- a/packages/fes-plugin-qiankun/package.json
+++ b/packages/fes-plugin-qiankun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fesjs/plugin-qiankun",
-  "version": "2.0.0-rc.24",
+  "version": "2.0.0-rc.26",
   "description": "@fesjs/plugin-qiankun",
   "main": "lib/index.js",
   "files": [
diff --git a/packages/fes-plugin-request/package.json b/packages/fes-plugin-request/package.json
index 8e7858e3..267f0488 100644
--- a/packages/fes-plugin-request/package.json
+++ b/packages/fes-plugin-request/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fesjs/plugin-request",
-  "version": "2.0.0-rc.21",
+  "version": "2.0.0-rc.26",
   "description": "@fesjs/plugin-request",
   "main": "lib/index.js",
   "files": [
@@ -33,4 +33,4 @@
   "dependencies": {
     "axios": "0.21.1"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json
index d6089f5c..2bca5c70 100644
--- a/packages/fes-preset-built-in/package.json
+++ b/packages/fes-preset-built-in/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fesjs/preset-built-in",
-  "version": "2.0.0-rc.24",
+  "version": "2.0.0-rc.26",
   "description": "@fesjs/preset-built-in",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -72,4 +72,4 @@
     "webpack-dev-server": "^3.11.2",
     "webpackbar": "^5.0.0-3"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/fes/package.json b/packages/fes/package.json
index 971d3169..827c3b78 100644
--- a/packages/fes/package.json
+++ b/packages/fes/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fesjs/fes",
-    "version": "2.0.0-rc.24",
+    "version": "2.0.0-rc.26",
     "description": "一个好用的前端管理台快速开发框架",
     "preferGlobal": true,
     "scripts": {
@@ -40,7 +40,7 @@
     ],
     "dependencies": {
         "@fesjs/compiler": "^2.0.0-rc.5",
-        "@fesjs/preset-built-in": "^2.0.0-rc.24",
+        "@fesjs/preset-built-in": "^2.0.0-rc.26",
         "@fesjs/runtime": "^2.0.0-rc.5",
         "@umijs/utils": "3.3.3",
         "resolve-cwd": "^3.0.0"

From ee71681505e620ed9b0025cda434c9df1554c1c0 Mon Sep 17 00:00:00 2001
From: winixt <haizekuo@gmail.com>
Date: Tue, 25 May 2021 22:21:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20patchRoutes=20=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fes-preset-built-in/src/plugins/generateFiles/fes/fes.tpl | 2 +-
 .../src/plugins/misc/route/template/routes.tpl                | 4 ++--
 .../src/plugins/misc/route/template/runtime.tpl               | 4 ++--
 packages/fes-template-h5/src/app.js                           | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/fes-preset-built-in/src/plugins/generateFiles/fes/fes.tpl b/packages/fes-preset-built-in/src/plugins/generateFiles/fes/fes.tpl
index a4d45f41..a2ecd1d9 100644
--- a/packages/fes-preset-built-in/src/plugins/generateFiles/fes/fes.tpl
+++ b/packages/fes-preset-built-in/src/plugins/generateFiles/fes/fes.tpl
@@ -31,7 +31,7 @@ const renderClient = (opts = {}) => {
     plugin.applyPlugins({
         key: 'onAppCreated',
         type: ApplyPluginsType.event,
-        args: { app },
+        args: { app, routes },
     });
 
     if (rootElement) {
diff --git a/packages/fes-preset-built-in/src/plugins/misc/route/template/routes.tpl b/packages/fes-preset-built-in/src/plugins/misc/route/template/routes.tpl
index 3e134cd6..55fddff5 100644
--- a/packages/fes-preset-built-in/src/plugins/misc/route/template/routes.tpl
+++ b/packages/fes-preset-built-in/src/plugins/misc/route/template/routes.tpl
@@ -16,7 +16,7 @@ export function getRoutes() {
 const ROUTER_BASE = '{{{ routerBase }}}';
 let router = null;
 let history = null;
-export const createRouter = () => {
+export const createRouter = (routes) => {
   if (router) {
     return router;
   }
@@ -27,7 +27,7 @@ export const createRouter = () => {
   });
   router = createVueRouter({
     history,
-    routes: getRoutes()
+    routes
   });
 
   plugin.applyPlugins({
diff --git a/packages/fes-preset-built-in/src/plugins/misc/route/template/runtime.tpl b/packages/fes-preset-built-in/src/plugins/misc/route/template/runtime.tpl
index 3c40ee5d..7d05be90 100644
--- a/packages/fes-preset-built-in/src/plugins/misc/route/template/runtime.tpl
+++ b/packages/fes-preset-built-in/src/plugins/misc/route/template/runtime.tpl
@@ -1,6 +1,6 @@
 import { createRouter } from "./routes";
 
-export function onAppCreated({ app }) {
-    const router = createRouter();
+export function onAppCreated({ app, routes }) {
+    const router = createRouter(routes);
     app.use(router);
 }
diff --git a/packages/fes-template-h5/src/app.js b/packages/fes-template-h5/src/app.js
index 9da182a1..8d70d71f 100644
--- a/packages/fes-template-h5/src/app.js
+++ b/packages/fes-template-h5/src/app.js
@@ -12,3 +12,7 @@ export const request = {
         }
     }
 };
+
+export function patchRoutes() {
+    console.log('patchRoutes');
+}