+
+ main
+
+
+
+
+
+
+
+ Content of Tab Pane 3
+
+
+
+
+{
+ "name": "index",
+ "title": "首页"
+}
+
+
diff --git a/packages/fes-plugin-qiankun/examples/webpack-main/src/pages/micro/index.vue b/packages/fes-plugin-qiankun/examples/webpack-main/src/pages/micro/index.vue
new file mode 100644
index 00000000..13661b70
--- /dev/null
+++ b/packages/fes-plugin-qiankun/examples/webpack-main/src/pages/micro/index.vue
@@ -0,0 +1,7 @@
+
+{
+ "name": "micro-index",
+ "title": "子应用1-首页",
+ "microApp": "micro"
+}
+
diff --git a/packages/fes-plugin-qiankun/examples/webpack-main/src/pages/micro/test.vue b/packages/fes-plugin-qiankun/examples/webpack-main/src/pages/micro/test.vue
new file mode 100644
index 00000000..d77b3272
--- /dev/null
+++ b/packages/fes-plugin-qiankun/examples/webpack-main/src/pages/micro/test.vue
@@ -0,0 +1,7 @@
+
+{
+ "name": "micro-test",
+ "title": "子应用1-测试",
+ "microApp": "micro"
+}
+
diff --git a/packages/fes-plugin-qiankun/examples/webpack-main/tsconfig.json b/packages/fes-plugin-qiankun/examples/webpack-main/tsconfig.json
new file mode 100644
index 00000000..ea930c0b
--- /dev/null
+++ b/packages/fes-plugin-qiankun/examples/webpack-main/tsconfig.json
@@ -0,0 +1,37 @@
+{
+ "compilerOptions": {
+ "outDir": "build/dist",
+ "module": "esnext",
+ "target": "esnext",
+ "lib": ["esnext", "dom"],
+ "sourceMap": true,
+ "baseUrl": ".",
+ "jsx": "preserve",
+ "allowSyntheticDefaultImports": true,
+ "moduleResolution": "node",
+ "forceConsistentCasingInFileNames": true,
+ "noImplicitReturns": true,
+ "suppressImplicitAnyIndexErrors": true,
+ "noUnusedLocals": true,
+ "allowJs": true,
+ "skipLibCheck": true,
+ "experimentalDecorators": true,
+ "strict": true,
+ "paths": {
+ "@/*": ["./src/*"],
+ "@@/*": ["./src/.fes/*"]
+ }
+ },
+ "include": [
+ "src/**/*",
+ "tests/**/*",
+ "test/**/*",
+ "__test__/**/*",
+ "typings/**/*",
+ "config/**/*",
+ ".eslintrc.js",
+ ".stylelintrc.js",
+ ".prettierrc.js"
+ ],
+ "exclude": ["node_modules", "build", "dist", "scripts", "src/.fes/*", "webpack", "jest"]
+}
diff --git a/packages/fes-plugin-qiankun/package.json b/packages/fes-plugin-qiankun/package.json
index 2a6a94e8..0941f9ab 100644
--- a/packages/fes-plugin-qiankun/package.json
+++ b/packages/fes-plugin-qiankun/package.json
@@ -8,8 +8,9 @@
],
"scripts": {
"start": "npm-run-all --parallel start:*",
- "start:master": "cd ./examples/main && fes dev",
- "start:app1": "cd ./examples/app1 && fes dev"
+ "start:vite-main": "cd ./examples/vite-main && fes dev",
+ "start:webpack-main": "cd ./examples/webpack-main && fes dev",
+ "start:micro": "cd ./examples/micro && fes dev"
},
"repository": {
"type": "git",
diff --git a/packages/fes-plugin-qiankun/src/micro/index.js b/packages/fes-plugin-qiankun/src/micro/index.js
index 1b8a5edf..b97ab49b 100644
--- a/packages/fes-plugin-qiankun/src/micro/index.js
+++ b/packages/fes-plugin-qiankun/src/micro/index.js
@@ -19,117 +19,122 @@ export default function (api) {
enableBy: () => isSlaveEnable(api),
});
- api.modifyDefaultConfig((memo) => {
- const initialMicroOptions = {
- devSourceMap: true,
- ...JSON.parse(process.env.INITIAL_QIANKUN_MIRCO_OPTIONS || '{}'),
- ...(memo.qiankun || {}).micro,
- };
- const modifiedDefaultConfig = {
- ...memo,
- qiankun: {
- ...memo.qiankun,
- slave: initialMicroOptions,
+ if (api.builder.isVite) {
+ // 处理
+ } else {
+ api.modifyDefaultConfig((memo) => {
+ const initialMicroOptions = {
+ devSourceMap: true,
+ ...JSON.parse(process.env.INITIAL_QIANKUN_MIRCO_OPTIONS || '{}'),
+ ...(memo.qiankun || {}).micro,
+ };
+ const modifiedDefaultConfig = {
+ ...memo,
+ qiankun: {
+ ...memo.qiankun,
+ slave: initialMicroOptions,
+ },
+ };
+
+ const shouldNotModifyDefaultBase = api.userConfig.qiankun?.slave?.shouldNotModifyDefaultBase ?? initialMicroOptions.shouldNotModifyDefaultBase;
+ if (!shouldNotModifyDefaultBase) {
+ modifiedDefaultConfig.router.base = `/${api.pkg.name}`;
+ }
+
+ return modifiedDefaultConfig;
+ });
+
+ const absRuntimePath = join(namespace, 'runtime.js');
+ const absLifecyclesPath = join(namespace, 'lifecycles.js');
+ const absMicroOptionsPath = join(namespace, 'slaveOptions.js');
+ const absPublicPath = join(namespace, 'publicPath.js');
+ const absModelPath = join(namespace, 'qiankunModel.js');
+
+ // 更改public path
+ api.addEntryImportsAhead(() => [{ source: `@@/${absPublicPath}` }]);
+
+ api.register({
+ key: 'addExtraModels',
+ fn: () => {
+ if (api.hasPlugins(['@fesjs/plugin-model'])) {
+ return [
+ {
+ absPath: `@@/${absModelPath}`,
+ namespace: qiankunStateFromMainModelNamespace,
+ },
+ ];
+ }
+ return [];
},
- };
-
- const shouldNotModifyDefaultBase = api.userConfig.qiankun?.slave?.shouldNotModifyDefaultBase ?? initialMicroOptions.shouldNotModifyDefaultBase;
- if (!shouldNotModifyDefaultBase) {
- modifiedDefaultConfig.router.base = `/${api.pkg.name}`;
- }
-
- return modifiedDefaultConfig;
- });
-
- const absRuntimePath = join(namespace, 'runtime.js');
- const absLifecyclesPath = join(namespace, 'lifecycles.js');
- const absMicroOptionsPath = join(namespace, 'slaveOptions.js');
- const absPublicPath = join(namespace, 'publicPath.js');
- const absModelPath = join(namespace, 'qiankunModel.js');
-
- // 更改public path
- api.addEntryImportsAhead(() => [{ source: `@@/${absPublicPath}` }]);
-
- api.register({
- key: 'addExtraModels',
- fn: () => {
- if (api.hasPlugins(['@fesjs/plugin-model'])) {
- return [
- {
- absPath: `@@/${absModelPath}`,
- namespace: qiankunStateFromMainModelNamespace,
- },
- ];
- }
- return [];
- },
- });
-
- api.onGenerateFiles(() => {
- const HAS_PLUGIN_MODEL = api.hasPlugins(['@fesjs/plugin-model']);
-
- api.writeTmpFile({
- path: absRuntimePath,
- content: readFileSync(join(__dirname, 'runtime/runtime.tpl'), 'utf-8'),
});
- api.writeTmpFile({
- path: absLifecyclesPath,
- content: Mustache.render(readFileSync(join(__dirname, 'runtime/lifecycles.tpl'), 'utf-8'), {
- HAS_PLUGIN_MODEL,
- }),
- });
+ api.onGenerateFiles(() => {
+ const HAS_PLUGIN_MODEL = api.hasPlugins(['@fesjs/plugin-model']);
- api.writeTmpFile({
- path: absPublicPath,
- content: `
- if (window.__POWERED_BY_QIANKUN__) {
- __webpack_public_path__ = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
- window.public_path = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
- }
- `,
- });
-
- api.writeTmpFile({
- path: absMicroOptionsPath,
- content: `
- let options = ${JSON.stringify((api.config.qiankun || {}).micro || {})};
- export const getSlaveOptions = () => options;
- export const setSlaveOptions = (newOpts) => options = ({ ...options, ...newOpts });
- `,
- });
-
- if (HAS_PLUGIN_MODEL) {
api.writeTmpFile({
- path: absModelPath,
- content: readFileSync(join(__dirname, 'runtime/qiankunModel.tpl'), 'utf-8'),
+ path: absRuntimePath,
+ content: readFileSync(join(__dirname, 'runtime/runtime.tpl'), 'utf-8'),
});
- }
- });
- api.addRuntimePlugin(() => `@@/${absRuntimePath}`);
+ api.writeTmpFile({
+ path: absLifecyclesPath,
+ content: Mustache.render(readFileSync(join(__dirname, 'runtime/lifecycles.tpl'), 'utf-8'), {
+ HAS_PLUGIN_MODEL,
+ }),
+ });
- api.chainWebpack((config) => {
- assert(api.pkg.name, 'You should have name in package.json');
- config.output.libraryTarget('umd').library(`${api.pkg.name}-[name]`);
- return config;
- });
+ api.writeTmpFile({
+ path: absPublicPath,
+ content: `
+ if (window.__POWERED_BY_QIANKUN__) {
+ __webpack_public_path__ = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+ window.public_path = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+ }
+ `,
+ });
- api.addEntryImports(() => ({
- source: `@@/${absLifecyclesPath}`,
- specifier: '{ genMount as qiankun_genMount, genBootstrap as qiankun_genBootstrap, genUnmount as qiankun_genUnmount, genUpdate as qiankun_genUpdate }',
- }));
+ api.writeTmpFile({
+ path: absMicroOptionsPath,
+ content: `
+ let options = ${JSON.stringify((api.config.qiankun || {}).micro || {})};
+ export const getSlaveOptions = () => options;
+ export const setSlaveOptions = (newOpts) => options = ({ ...options, ...newOpts });
+ `,
+ });
- api.addEntryCode(
- () => `
-export const bootstrap = qiankun_genBootstrap(clientRender, app);
-export const mount = qiankun_genMount('#${api.config.mountElementId}');
-export const unmount = qiankun_genUnmount();
-export const update = qiankun_genUpdate();
+ if (HAS_PLUGIN_MODEL) {
+ api.writeTmpFile({
+ path: absModelPath,
+ content: readFileSync(join(__dirname, 'runtime/qiankunModel.tpl'), 'utf-8'),
+ });
+ }
+ });
-if (!window.__POWERED_BY_QIANKUN__) {
- bootstrap().then(mount);
-}
-`,
- );
+ api.addRuntimePlugin(() => `@@/${absRuntimePath}`);
+
+ api.chainWebpack((config) => {
+ assert(api.pkg.name, 'You should have name in package.json');
+ config.output.libraryTarget('umd').library(`${api.pkg.name}-[name]`);
+ return config;
+ });
+
+ api.addEntryImports(() => ({
+ source: `@@/${absLifecyclesPath}`,
+ specifier:
+ '{ genMount as qiankun_genMount, genBootstrap as qiankun_genBootstrap, genUnmount as qiankun_genUnmount, genUpdate as qiankun_genUpdate }',
+ }));
+
+ api.addEntryCode(
+ () => `
+ export const bootstrap = qiankun_genBootstrap(clientRender, app);
+ export const mount = qiankun_genMount('#${api.config.mountElementId}');
+ export const unmount = qiankun_genUnmount();
+ export const update = qiankun_genUpdate();
+
+ if (!window.__POWERED_BY_QIANKUN__) {
+ bootstrap().then(mount);
+ }
+ `,
+ );
+ }
}