From db9c97b13704535c8e7230606fe10926ed51c05e Mon Sep 17 00:00:00 2001 From: futengda Date: Mon, 7 Jun 2021 18:41:55 +0800 Subject: [PATCH 1/3] feat: allow `entryCodeAhead` block to modify pluginArgs --- .../preset-built-in/src/plugins/generateFiles/umi.tpl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/preset-built-in/src/plugins/generateFiles/umi.tpl b/packages/preset-built-in/src/plugins/generateFiles/umi.tpl index d645a6b8916b..9b51f6571253 100644 --- a/packages/preset-built-in/src/plugins/generateFiles/umi.tpl +++ b/packages/preset-built-in/src/plugins/generateFiles/umi.tpl @@ -8,6 +8,8 @@ import { renderClient } from '{{{ rendererPath }}}'; import { getRoutes } from './core/routes'; {{{ imports }}} +const pluginArgs = {}; + {{{ entryCodeAhead }}} const getClientRender = (args: { hot?: boolean; routes?: any[] } = {}) => plugin.applyPlugins({ @@ -33,13 +35,14 @@ const getClientRender = (args: { hot?: boolean; routes?: any[] } = {}) => plugin defaultTitle: `{{{ defaultTitle }}}`, {{/enableTitle}} }, + args, }); return renderClient(opts); }, args, }); -const clientRender = getClientRender(); +const clientRender = getClientRender(pluginArgs); export default clientRender(); {{{ entryCode }}} @@ -52,10 +55,10 @@ if (module.hot) { const ret = require('./core/routes'); if (ret.then) { ret.then(({ getRoutes }) => { - getClientRender({ hot: true, routes: getRoutes() })(); + getClientRender({ hot: true, routes: getRoutes(), appId })(); }); } else { - getClientRender({ hot: true, routes: ret.getRoutes() })(); + getClientRender({ hot: true, routes: ret.getRoutes(), appId })(); } }); } From 85a29f7a2898220d29826913754a25a1c5132317 Mon Sep 17 00:00:00 2001 From: futengda Date: Mon, 7 Jun 2021 18:44:09 +0800 Subject: [PATCH 2/3] fix: use `pluginArgs` to set appId --- packages/preset-built-in/src/plugins/generateFiles/umi.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/preset-built-in/src/plugins/generateFiles/umi.tpl b/packages/preset-built-in/src/plugins/generateFiles/umi.tpl index 9b51f6571253..f037bce9c93d 100644 --- a/packages/preset-built-in/src/plugins/generateFiles/umi.tpl +++ b/packages/preset-built-in/src/plugins/generateFiles/umi.tpl @@ -55,10 +55,10 @@ if (module.hot) { const ret = require('./core/routes'); if (ret.then) { ret.then(({ getRoutes }) => { - getClientRender({ hot: true, routes: getRoutes(), appId })(); + getClientRender({ hot: true, routes: getRoutes(), appId: pluginArgs.appId})(); }); } else { - getClientRender({ hot: true, routes: ret.getRoutes(), appId })(); + getClientRender({ hot: true, routes: ret.getRoutes(), appId: pluginArgs.appId })(); } }); } From bf08be1a8af67f8fc089b43e482c075be6f15d60 Mon Sep 17 00:00:00 2001 From: futengda Date: Mon, 7 Jun 2021 18:46:39 +0800 Subject: [PATCH 3/3] fix: merge pluginsArgs to hmr's getClientRender --- packages/preset-built-in/src/plugins/generateFiles/umi.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/preset-built-in/src/plugins/generateFiles/umi.tpl b/packages/preset-built-in/src/plugins/generateFiles/umi.tpl index f037bce9c93d..a75b27b3c369 100644 --- a/packages/preset-built-in/src/plugins/generateFiles/umi.tpl +++ b/packages/preset-built-in/src/plugins/generateFiles/umi.tpl @@ -55,10 +55,10 @@ if (module.hot) { const ret = require('./core/routes'); if (ret.then) { ret.then(({ getRoutes }) => { - getClientRender({ hot: true, routes: getRoutes(), appId: pluginArgs.appId})(); + getClientRender({ hot: true, routes: getRoutes(), ...pluginArgs })(); }); } else { - getClientRender({ hot: true, routes: ret.getRoutes(), appId: pluginArgs.appId })(); + getClientRender({ hot: true, routes: ret.getRoutes(), ...pluginArgs })(); } }); }