diff --git a/packages/fes-plugin-qiankun/src/constants.js b/packages/fes-plugin-qiankun/src/constants.js index 3d0e6263..92f19f5b 100644 --- a/packages/fes-plugin-qiankun/src/constants.js +++ b/packages/fes-plugin-qiankun/src/constants.js @@ -1,4 +1,4 @@ -export const defaultMainRootId = '#root-master'; +export const defaultMainRootId = 'root-master'; export const defaultHistoryType = 'hash'; export const qiankunStateForMicroModelNamespace = 'qiankunStateForMicro'; export const qiankunStateFromMainModelNamespace = 'qiankunStateFromMain'; diff --git a/packages/fes-plugin-qiankun/src/main/runtime/runtime.tpl b/packages/fes-plugin-qiankun/src/main/runtime/runtime.tpl index 0beb6f37..e69de29b 100644 --- a/packages/fes-plugin-qiankun/src/main/runtime/runtime.tpl +++ b/packages/fes-plugin-qiankun/src/main/runtime/runtime.tpl @@ -1,85 +0,0 @@ -// import { deferred } from '@@/plugin-qiankun/qiankunDefer.js'; -// import '@@/plugin-qiankun/qiankunRootExports.js'; -// import subAppConfig from '@@/plugin-qiankun/subAppsConfig.json'; -// import { registerMicroApps, start } from 'qiankun'; -// import { createApp, h } from 'vue'; -// import { plugin, ApplyPluginsType } from '@@/core/coreExports'; -// import { defaultMountContainerId, testPathWithPrefix, toArray } from '../common'; - -// async function getMasterRuntime() { -// const config = plugin.applyPlugins({ -// key: 'qiankun', -// type: ApplyPluginsType.modify, -// initialValue: {}, -// async: true -// }); -// const { master } = config; -// return master || config; -// } - -// export async function render(oldRender) { -// oldRender(); -// function isAppActive(location, history, base) { -// const baseConfig = toArray(base); -// switch (history.type || history) { -// case 'hash': -// return baseConfig.some(pathPrefix => testPathWithPrefix(`#${pathPrefix}`, location.hash)); -// case 'browser': -// return baseConfig.some(pathPrefix => testPathWithPrefix(pathPrefix, location.pathname)); -// default: -// return false; -// } -// } -// const runtimeConfig = await getMasterRuntime(); -// const { -// apps, jsSandbox = false, prefetch = true, defer = false, lifeCycles, masterHistory, ...otherConfigs -// } = { -// ...subAppConfig, -// ...runtimeConfig -// }; - -// assert(apps && apps.length, 'sub apps must be config when using fes-plugin-qiankun'); - -// registerMicroApps(apps.map(({ -// name, entry, base, history = masterHistory, mountElementId = defaultMountContainerId, props -// }) => ({ -// name, -// entry, -// activeRule: location => isAppActive(location, history, base), -// render: ({ appContent, loading }) => { -// if (process.env.NODE_ENV === 'development') { -// console.info(`app ${name} loading ${loading}`); -// } -// if (mountElementId) { -// const container = document.getElementById(mountElementId); -// if (container) { -// const subApp = { -// setup() { - -// }, -// render() { -// h('div', { -// dangerouslySetInnerHTML: { -// __html: appContent -// } -// }); -// } -// }; -// const app = createApp(); -// app.mount(subApp, container); -// } -// } -// }, -// props: { -// base, -// history, -// ...props -// } -// })), lifeCycles); - -// if (defer) { -// await deferred.promise; -// } - -// start({ jsSandbox, prefetch, ...otherConfigs }); -// } diff --git a/packages/fes-plugin-qiankun/src/micro/index.js b/packages/fes-plugin-qiankun/src/micro/index.js index 2540031e..1945e4f7 100644 --- a/packages/fes-plugin-qiankun/src/micro/index.js +++ b/packages/fes-plugin-qiankun/src/micro/index.js @@ -164,8 +164,8 @@ export default function (api) { api.addEntryCode( () => ` export const bootstrap = qiankun_genBootstrap(completeClientRender, app); -export const mount = qiankun_genMount('${api.config.mountElementId}'); -export const unmount = qiankun_genUnmount('${api.config.mountElementId}'); +export const mount = qiankun_genMount('#${api.config.mountElementId}'); +export const unmount = qiankun_genUnmount('#${api.config.mountElementId}'); export const update = qiankun_genUpdate(); if (!window.__POWERED_BY_QIANKUN__) { diff --git a/packages/fes-plugin-qiankun/src/micro/runtime/runtime.tpl b/packages/fes-plugin-qiankun/src/micro/runtime/runtime.tpl index 3d6cd99c..e69de29b 100644 --- a/packages/fes-plugin-qiankun/src/micro/runtime/runtime.tpl +++ b/packages/fes-plugin-qiankun/src/micro/runtime/runtime.tpl @@ -1,12 +0,0 @@ -// import { h } from 'vue'; -// import qiankunRender from './lifecycles'; - -// export function rootContainer(container) { -// const value = typeof window !== 'undefined' ? window.g_rootExports : {}; -// const { Context } = require('@@/plugin-qiankun/qiankunContext'); -// return h(Context.Provider, { value }, container); -// } - -// export const render = oldRender => qiankunRender().then(() => { -// oldRender(); -// }); diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js index 7b08e919..5f35271a 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js +++ b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js @@ -13,12 +13,12 @@ export default async function createHtmlWebpackConfig({ isProd }) { const htmlOptions = { + title: 'fes.js', filename: '[name].html', ...config.html, - templateParameters: resolveDefine(null, true) + templateParameters: resolveDefine(null, true), + mountElementId: config.mountElementId }; - htmlOptions.title = htmlOptions.title || 'fes.js'; - if (isProd) { Object.assign(htmlOptions, { diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index-default.html b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index-default.html index 4b9c8375..cf7300b6 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index-default.html +++ b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index-default.html @@ -7,6 +7,6 @@ <%= htmlWebpackPlugin.options.title %> -
+
diff --git a/packages/fes-preset-built-in/src/plugins/features/mountElementId.js b/packages/fes-preset-built-in/src/plugins/features/mountElementId.js index 686b1ca7..11a7a105 100644 --- a/packages/fes-preset-built-in/src/plugins/features/mountElementId.js +++ b/packages/fes-preset-built-in/src/plugins/features/mountElementId.js @@ -3,7 +3,7 @@ export default (api) => { api.describe({ key: 'mountElementId', config: { - default: '#app', + default: 'app', schema(joi) { return joi.string().allow(''); } diff --git a/packages/fes-preset-built-in/src/plugins/generateFiles/fes/index.js b/packages/fes-preset-built-in/src/plugins/generateFiles/fes/index.js index f74aaa2f..b4bed847 100644 --- a/packages/fes-preset-built-in/src/plugins/generateFiles/fes/index.js +++ b/packages/fes-preset-built-in/src/plugins/generateFiles/fes/index.js @@ -26,7 +26,7 @@ export default function (api) { enableTitle: api.config.title !== false, defaultTitle: api.config.title || '', runtimePath, - rootElement: api.config.mountElementId || '#app', + rootElement: `#${api.config.mountElementId || 'app'}`, entryCode: ( await api.applyPlugins({ key: 'addEntryCode',