From b4fe951859d99df77b5df0be99f53826a6b14e57 Mon Sep 17 00:00:00 2001 From: harrywan Date: Fri, 25 Jun 2021 15:43:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20patchRoutes=E5=BB=B6=E5=90=8E,?= =?UTF-8?q?=E6=94=BE=E5=9C=A8createRouter=E4=B9=8B=E5=89=8D=E6=89=A7?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lerna.json | 2 +- .../src/plugins/misc/route/template/routes.tpl | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lerna.json b/lerna.json index 0af0cb90..acfa9696 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.0", + "version": "independent", "changelog": { "repo": "WeBankFinTech/fes.js", "cacheDir": ".changelog", 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 1d89a137..e6a6c6aa 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 @@ -3,13 +3,6 @@ import { plugin } from '@@/core/coreExports'; export function getRoutes() { const routes = {{{ routes }}}; - - plugin.applyPlugins({ - key: 'patchRoutes', - type: ApplyPluginsType.event, - args: { routes }, - }); - return routes; } @@ -28,7 +21,13 @@ export const createRouter = (routes) => { }, initialValue: {{{ CREATE_HISTORY }}}, }); - history = createHistory(ROUTER_BASE) + history = createHistory(ROUTER_BASE); + // 修改routes + plugin.applyPlugins({ + key: 'patchRoutes', + type: ApplyPluginsType.event, + args: { routes }, + }); router = createVueRouter({ history, routes From b767eeab4fbcc06c857c40eae92063f282a96d25 Mon Sep 17 00:00:00 2001 From: harrywan Date: Fri, 25 Jun 2021 15:45:13 +0800 Subject: [PATCH 2/4] chore(release): publish - @fesjs/preset-built-in@2.0.1 - @fesjs/fes@2.0.1 --- packages/fes-preset-built-in/package.json | 2 +- packages/fes/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json index 47714165..4f174ca5 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", + "version": "2.0.1", "description": "@fesjs/preset-built-in", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/fes/package.json b/packages/fes/package.json index 1ff77226..5ec9320f 100644 --- a/packages/fes/package.json +++ b/packages/fes/package.json @@ -1,6 +1,6 @@ { "name": "@fesjs/fes", - "version": "2.0.0", + "version": "2.0.1", "description": "一个好用的前端管理台快速开发框架", "preferGlobal": true, "scripts": { @@ -40,7 +40,7 @@ ], "dependencies": { "@fesjs/compiler": "^2.0.0", - "@fesjs/preset-built-in": "^2.0.0", + "@fesjs/preset-built-in": "^2.0.1", "@fesjs/runtime": "^2.0.0", "@umijs/utils": "3.3.3", "resolve-cwd": "^3.0.0" From 0c0bc8a05b21b83208be2a4b4c314bfa5b4f2d71 Mon Sep 17 00:00:00 2001 From: harrywan Date: Thu, 1 Jul 2021 09:36:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dpc=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/create-fes-app/templates/app/pc/package.json | 4 ++-- .../templates/app/pc/src/components/UserCenter.vue | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/create-fes-app/templates/app/pc/package.json b/packages/create-fes-app/templates/app/pc/package.json index 4b0a3e6b..45132a60 100644 --- a/packages/create-fes-app/templates/app/pc/package.json +++ b/packages/create-fes-app/templates/app/pc/package.json @@ -51,8 +51,8 @@ "@fesjs/plugin-layout": "^2.0.0", "@fesjs/plugin-model": "^2.0.0", "@fesjs/plugin-enums": "^2.0.0", - "ant-design-vue": "^2.0.0", - "vue": "^3.0.5" + "ant-design-vue": "^2.2.0", + "vue": "^3.1.0" }, "private": true } \ No newline at end of file diff --git a/packages/create-fes-app/templates/app/pc/src/components/UserCenter.vue b/packages/create-fes-app/templates/app/pc/src/components/UserCenter.vue index 17d6536f..6cba6e3c 100644 --- a/packages/create-fes-app/templates/app/pc/src/components/UserCenter.vue +++ b/packages/create-fes-app/templates/app/pc/src/components/UserCenter.vue @@ -1,5 +1,5 @@ + From 6f93092f1040ea159b89c498304ec426b135e68c Mon Sep 17 00:00:00 2001 From: harrywan Date: Thu, 1 Jul 2021 09:37:01 +0800 Subject: [PATCH 4/4] chore(release): publish - @fesjs/create-fes-app@2.0.1 --- packages/create-fes-app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-fes-app/package.json b/packages/create-fes-app/package.json index c2ce062c..e7b264b2 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", + "version": "2.0.1", "description": "create a app base on fes.js", "main": "lib/index.js", "files": [