@umijs/plugins 4.0.0-rc.9 → 4.0.2

package/dist/model.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const t = __importStar(require("@umijs/bundler-utils/compiled/babel/types"));
 const fs_1 = require("fs");
@@ -49,17 +40,8 @@ exports.default = (api) => {
         },
         enableBy: api.EnableBy.config,
     });
-    api.modifyAppData((memo) => __awaiter(void 0, void 0, void 0, function* () {
-        const models = yield getAllModels(api);
-        memo.pluginModel = {
-            models,
-        };
-        return memo;
-    }));
-    api.onGenerateFiles((args) => __awaiter(void 0, void 0, void 0, function* () {
-        const models = args.isFirstTime
-            ? api.appData.pluginModel.models
-            : yield getAllModels(api);
+    api.onGenerateFiles(async () => {
+        const models = await getAllModels(api);
         // model.ts
         api.writeTmpFile({
             path: 'model.ts',
@@ -94,7 +76,7 @@ export function dataflowProvider(container, opts) {
 }
       `,
         });
-    }));
+    });
     api.addTmpGenerateWatcherPaths(() => {
         return [(0, path_1.join)(api.paths.absSrcPath, 'models')];
     });
@@ -102,19 +84,18 @@ export function dataflowProvider(container, opts) {
         return [(0, withTmpPath_1.withTmpPath)({ api, path: 'runtime.tsx' })];
     });
 };
-function getAllModels(api) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const extraModels = yield api.applyPlugins({
-            key: 'addExtraModels',
-            type: api.ApplyPluginsType.add,
-            initialValue: [],
-        });
-        return new modelUtils_1.ModelUtils(api, {
-            astTest({ node }) {
-                return t.isArrowFunctionExpression(node) || t.isFunctionDeclaration(node);
-            },
-        }).getAllModels({
-            extraModels: [...extraModels, ...(api.config.model.extraModels || [])],
-        });
+async function getAllModels(api) {
+    const extraModels = await api.applyPlugins({
+        key: 'addExtraModels',
+        type: api.ApplyPluginsType.add,
+        initialValue: [],
+    });
+    return new modelUtils_1.ModelUtils(api, {
+        astTest({ node }) {
+            return t.isArrowFunctionExpression(node) || t.isFunctionDeclaration(node);
+        },
+    }).getAllModels({
+        sort: {},
+        extraModels: [...extraModels, ...(api.config.model.extraModels || [])],
     });
 }

package/dist/qiankun/master.js

@@ -23,22 +23,30 @@ exports.default = (api) => {
     api.addRuntimePlugin(() => {
         return [(0, withTmpPath_1.withTmpPath)({ api, path: 'masterRuntimePlugin.tsx' })];
     });
-    api.modifyDefaultConfig((config) => (Object.assign(Object.assign({}, config), { mountElementId: constants_1.defaultMasterRootId, qiankun: Object.assign(Object.assign({}, config.qiankun), { master: Object.assign(Object.assign({}, JSON.parse(process.env.INITIAL_QIANKUN_MASTER_OPTIONS || '{}')), (config.qiankun || {}).master) }) })));
-    // TODO: modify routes
+    api.modifyDefaultConfig((config) => ({
+        ...config,
+        mountElementId: constants_1.defaultMasterRootId,
+        qiankun: {
+            ...config.qiankun,
+            master: {
+                ...JSON.parse(process.env.INITIAL_QIANKUN_MASTER_OPTIONS || '{}'),
+                ...(config.qiankun || {}).master,
+            },
+        },
+    }));
     api.modifyRoutes((memo) => {
         Object.keys(memo).forEach((id) => {
+            var _a;
             const route = memo[id];
             if (route.microApp) {
                 const appName = route.microApp;
-                // TODO: config base
-                const base = '/';
-                // TODO: config masterHistoryType
-                const masterHistoryType = 'browser';
+                const base = api.config.base || '/';
+                const masterHistoryType = ((_a = api.config.history) === null || _a === void 0 ? void 0 : _a.type) || 'browser';
                 const routeProps = route.microAppProps || {};
                 const normalizedRouteProps = JSON.stringify(routeProps).replace(/"/g, "'");
                 route.file = `(async () => {
           const { getMicroAppRouteComponent } = await import('@@/plugin-qiankun-master/getMicroAppRouteComponent');
-          return getMicroAppRouteComponent({ appName: '${appName}', base: '${base}', masterHistoryType: '${masterHistoryType}', routeProps: ${normalizedRouteProps} })
+          return getMicroAppRouteComponent({ appName: '${appName}', base: '${base}', routePath: '${route.path}', masterHistoryType: '${masterHistoryType}', routeProps: ${normalizedRouteProps} })
         })()`;
             }
         });
@@ -65,7 +73,11 @@ exports.default = (api) => {
         api.writeTmpFile({
             path: 'masterOptions.ts',
             content: `
-let options = ${JSON.stringify(Object.assign({ masterHistoryType: ((_a = api.config.history) === null || _a === void 0 ? void 0 : _a.type) || constants_1.defaultHistoryType, base: api.config.base || '/' }, api.config.qiankun.master))};
+let options = ${JSON.stringify({
+                masterHistoryType: ((_a = api.config.history) === null || _a === void 0 ? void 0 : _a.type) || constants_1.defaultHistoryType,
+                base: api.config.base || '/',
+                ...api.config.qiankun.master,
+            })};
 export const getMasterOptions = () => options;
 export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts });
       `,
@@ -91,7 +103,6 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
                     path: file.replace(/\.tpl$/, ''),
                     tpl: getFileContent(file),
                     context: {
-                        runtimeHistory: api.config.runtimeHistory,
                         dynamicRoot: false,
                         hasModelPlugin: api.isPluginEnable('model'),
                         // dynamicRoot:
@@ -100,16 +111,25 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
                 });
             }
             else {
+                let content = getFileContent(file);
+                if (!api.config.qiankun.externalQiankun) {
+                    content = content.replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`);
+                }
                 api.writeTmpFile({
                     path: file.replace(/\.tpl$/, ''),
-                    content: getFileContent(file)
+                    content: content
                         .replace('__USE_MODEL__', api.isPluginEnable('model')
                         ? `import { useModel } from '@@/plugin-model'`
                         : `const useModel = null;`)
-                        .replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`)
                         .replace(/from 'lodash\//g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('lodash/package')))}/`),
                 });
             }
         });
+        api.writeTmpFile({
+            path: 'index.ts',
+            content: `
+export { MicroApp } from './MicroApp';
+      `,
+        });
     });
 };

package/dist/qiankun/slave.js

@@ -30,20 +30,32 @@ exports.default = (api) => {
         key: 'addExtraModels',
         fn() {
             return [
-                `@@/plugin-qiankun-slave/qiankunModel#{"namespace":"${constants_1.qiankunStateFromMasterModelNamespace}"}`,
+                (0, withTmpPath_1.withTmpPath)({
+                    api,
+                    path: `qiankunModel.ts#{"namespace":"${constants_1.qiankunStateFromMasterModelNamespace}"}`,
+                }),
             ];
         },
     });
     api.modifyDefaultConfig((memo) => {
-        var _a, _b, _c;
-        const initialSlaveOptions = Object.assign(Object.assign({ devSourceMap: true }, JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || '{}')), (memo.qiankun || {}).slave);
-        const modifiedDefaultConfig = Object.assign(Object.assign({}, memo), { 
+        var _a, _b, _c, _d;
+        const initialSlaveOptions = {
+            devSourceMap: true,
+            ...JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || '{}'),
+            ...(memo.qiankun || {}).slave,
+        };
+        const modifiedDefaultConfig = {
+            ...memo,
             // 默认开启 runtimePublicPath，避免出现 dynamic import 场景子应用资源地址出问题
-            runtimePublicPath: true, 
-            // TODO: runtimeHistory
-            runtimeHistory: {}, qiankun: Object.assign(Object.assign({}, memo.qiankun), { slave: initialSlaveOptions }) });
+            runtimePublicPath: true,
+            qiankun: {
+                ...memo.qiankun,
+                slave: initialSlaveOptions,
+            },
+        };
         const shouldNotModifyDefaultBase = (_c = (_b = (_a = api.userConfig.qiankun) === null || _a === void 0 ? void 0 : _a.slave) === null || _b === void 0 ? void 0 : _b.shouldNotModifyDefaultBase) !== null && _c !== void 0 ? _c : initialSlaveOptions.shouldNotModifyDefaultBase;
-        if (!shouldNotModifyDefaultBase) {
+        const historyType = ((_d = api.userConfig.history) === null || _d === void 0 ? void 0 : _d.type) || 'browser';
+        if (!shouldNotModifyDefaultBase && historyType !== 'hash') {
             // @ts-ignore
             modifiedDefaultConfig.base = `/${api.pkg.name}`;
         }
@@ -53,22 +65,23 @@ exports.default = (api) => {
         var _a, _b;
         // mfsu 场景默认给子应用增加 mfName 配置，从而避免冲突
         if (config.mfsu !== false) {
-            config.mfsu = Object.assign(Object.assign({}, config.mfsu), { mfName: ((_a = config.mfsu) === null || _a === void 0 ? void 0 : _a.mfName) ||
-                    `mf_${(_b = api.pkg.name) === null || _b === void 0 ? void 0 : _b.replace(/^@/, '').replace(/\W/g, '_')}` });
+            config.mfsu = {
+                ...config.mfsu,
+                mfName: ((_a = config.mfsu) === null || _a === void 0 ? void 0 : _a.mfName) ||
+                    `mf_${(_b = api.pkg.name) === null || _b === void 0 ? void 0 : _b.replace(/^@/, '').replace(/\W/g, '_')}`,
+            };
         }
         return config;
     });
-    // api.modifyPublicPathStr((publicPathStr) => {
-    //   const { runtimePublicPath } = api.config;
-    //   const { shouldNotModifyRuntimePublicPath } = (api.config.qiankun || {})
-    //     .slave!;
-    //   if (runtimePublicPath === true && !shouldNotModifyRuntimePublicPath) {
-    //     return `window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || "${
-    //       api.config.publicPath || '/'
-    //     }"`;
-    //   }
-    //   return publicPathStr;
-    // });
+    api.addHTMLHeadScripts(() => {
+        var _a, _b;
+        const dontModify = (_b = (_a = api.config.qiankun) === null || _a === void 0 ? void 0 : _a.slave) === null || _b === void 0 ? void 0 : _b.shouldNotModifyRuntimePublicPath;
+        return dontModify
+            ? []
+            : [
+                `window.publicPath = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || "${api.config.publicPath || '/'}";`,
+            ];
+    });
     api.chainWebpack((config) => {
         (0, assert_1.default)(api.pkg.name, 'You should have name in package.json.');
         const { shouldNotAddLibraryChunkName } = (api.config.qiankun || {}).slave;
@@ -113,30 +126,39 @@ if (!window.__POWERED_BY_QIANKUN__) {
     function getFileContent(file) {
         return (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../libs/qiankun/slave', file), 'utf-8');
     }
-    api.onGenerateFiles(() => {
-        //     api.writeTmpFile({
-        //       path: 'slaveOptions.ts',
-        //       content: `
-        // let options = ${JSON.stringify((api.config.qiankun || {}).slave || {})};
-        // export const getSlaveOptions = () => options;
-        // export const setSlaveOptions = (newOpts) => options = ({ ...options, ...newOpts });
-        //       `,
-        //     });
-        [
-            'qiankunModel.ts',
-            'connectMaster.tsx',
-            'slaveRuntimePlugin.ts',
-            'lifecycles.ts',
-        ].forEach((file) => {
+    api.onGenerateFiles({
+        fn() {
+            //     api.writeTmpFile({
+            //       path: 'slaveOptions.ts',
+            //       content: `
+            // let options = ${JSON.stringify((api.config.qiankun || {}).slave || {})};
+            // export const getSlaveOptions = () => options;
+            // export const setSlaveOptions = (newOpts) => options = ({ ...options, ...newOpts });
+            //       `,
+            //     });
+            [
+                'qiankunModel.ts',
+                'connectMaster.tsx',
+                'slaveRuntimePlugin.ts',
+                'lifecycles.ts',
+            ].forEach((file) => {
+                api.writeTmpFile({
+                    path: file.replace(/\.tpl$/, ''),
+                    content: getFileContent(file)
+                        .replace('__USE_MODEL__', api.isPluginEnable('model')
+                        ? `import { useModel } from '@@/plugin-model'`
+                        : `const useModel = null;`)
+                        .replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`)
+                        .replace(/from 'lodash\//g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('lodash/package')))}/`),
+                });
+            });
             api.writeTmpFile({
-                path: file.replace(/\.tpl$/, ''),
-                content: getFileContent(file)
-                    .replace('__USE_MODEL__', api.isPluginEnable('model')
-                    ? `import { useModel } from '@@/plugin/model'`
-                    : `const useModel = null;`)
-                    .replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`)
-                    .replace(/from 'lodash\//g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('lodash/package')))}/`),
+                path: 'index.ts',
+                content: `
+export { connectMaster } from './connectMaster';
+      `,
             });
-        });
+        },
+        before: 'model',
     });
 };

package/dist/qiankun.js

@@ -7,6 +7,7 @@ exports.default = (api) => {
                 return joi.object().keys({
                     slave: joi.object(),
                     master: joi.object(),
+                    externalQiankun: joi.boolean(),
                 });
             },
         },