@umijs/plugins 4.0.0-canary.20220429.3 → 4.0.0-canary.20220506.2

package/dist/utils/localeUtils.d.ts

@@ -0,0 +1,33 @@
+export declare type IAddAntdLocales = (args: {
+    lang: string;
+    country: string;
+}) => Promise<string[]>;
+export interface IGetLocaleFileListOpts {
+    localeFolder: string;
+    separator?: string;
+    absSrcPath?: string;
+    absPagesPath?: string;
+    addAntdLocales: IAddAntdLocales;
+    resolveKey: string;
+}
+/**
+ * 获取 moment 包的 locale 名称
+ * @param lang 语言
+ * @param country 国家
+ * @param resolveKey 用来resolve的key，moment 或者 dayjs，为了使 dayjs 可以替换 moment
+ */
+export declare const getMomentLocale: (lang: string, country: string, resolveKey: string) => {
+    momentLocale: string;
+};
+export declare const getAntdLocale: (lang: string, country: string) => string;
+export interface IGetLocaleFileListResult {
+    lang: string;
+    country: string;
+    name: string;
+    paths: string[];
+    antdLocale: string[];
+    momentLocale: string;
+}
+export declare const getLocaleList: (opts: IGetLocaleFileListOpts) => Promise<IGetLocaleFileListResult[]>;
+export declare const exactLocalePaths: (data: IGetLocaleFileListResult[]) => string[];
+export declare function isNeedPolyfill(targets?: {}): boolean;

package/dist/utils/localeUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"localeUtils.d.ts","sourceRoot":"","sources":["../../src/utils/localeUtils.ts"],"names":[],"mappings":"AAIA,oBAAY,eAAe,GAAG,CAAC,IAAI,EAAE;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAExB,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,eAAe,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,SACpB,MAAM,WACH,MAAM,cACH,MAAM,KACjB;IAAE,YAAY,EAAE,MAAM,CAAA;CAqBxB,CAAC;AAEF,eAAO,MAAM,aAAa,SAAU,MAAM,WAAW,MAAM,KAAG,MACV,CAAC;AAErD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB;AAiBD,eAAO,MAAM,aAAa,SAClB,sBAAsB,KAC3B,QAAQ,wBAAwB,EAAE,CA4DpC,CAAC;AAEF,eAAO,MAAM,gBAAgB,SACrB,wBAAwB,EAAE,KAC/B,MAAM,EAER,CAAC;AAEF,wBAAgB,cAAc,CAAC,OAAO,KAAK,WA4B1C"}

package/dist/utils/localeUtils.js

@@ -0,0 +1,126 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isNeedPolyfill = exports.exactLocalePaths = exports.getLocaleList = exports.getAntdLocale = exports.getMomentLocale = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
+/**
+ * 获取 moment 包的 locale 名称
+ * @param lang 语言
+ * @param country 国家
+ * @param resolveKey 用来resolve的key，moment 或者 dayjs，为了使 dayjs 可以替换 moment
+ */
+const getMomentLocale = (lang, country, resolveKey) => {
+    var _a, _b;
+    const momentLocation = require
+        .resolve(`${resolveKey}/locale/zh-cn`)
+        .replace(/zh\-cn\.js$/, '');
+    if ((0, fs_1.existsSync)((0, path_1.join)(momentLocation, `${lang}-${(_a = country === null || country === void 0 ? void 0 : country.toLocaleLowerCase) === null || _a === void 0 ? void 0 : _a.call(country)}.js`))) {
+        const momentLocale = `${lang}-${(_b = country === null || country === void 0 ? void 0 : country.toLocaleLowerCase) === null || _b === void 0 ? void 0 : _b.call(country)}`;
+        return {
+            momentLocale,
+        };
+    }
+    if ((0, fs_1.existsSync)((0, path_1.join)(momentLocation, `${lang}.js`))) {
+        return {
+            momentLocale: lang,
+        };
+    }
+    return { momentLocale: '' };
+};
+exports.getMomentLocale = getMomentLocale;
+const getAntdLocale = (lang, country) => `${lang}_${(country || lang).toLocaleUpperCase()}`;
+exports.getAntdLocale = getAntdLocale;
+/**
+ * 有些情况下可能项目包含的locale和antd的不匹配
+ * 这个方法用于检测
+ * @param localePath
+ * @returns
+ */
+const modulesHasLocale = (localePath) => {
+    try {
+        require.resolve(localePath);
+        return true;
+    }
+    catch (error) {
+        return false;
+    }
+};
+const getLocaleList = async (opts) => {
+    const { localeFolder, separator = '-', absSrcPath = '', absPagesPath = '', addAntdLocales, resolveKey = 'moment', } = opts;
+    const localeFileMath = new RegExp(`^([a-z]{2})${separator}?([A-Z]{2})?\.(js|json|ts)$`);
+    const localeFiles = plugin_utils_1.glob
+        .sync('*.{ts,js,json}', {
+        cwd: (0, plugin_utils_1.winPath)((0, path_1.join)(absSrcPath, localeFolder)),
+    })
+        .map((name) => (0, plugin_utils_1.winPath)((0, path_1.join)(absSrcPath, localeFolder, name)))
+        .concat(plugin_utils_1.glob
+        .sync(`**/${localeFolder}/*.{ts,js,json}`, {
+        cwd: absPagesPath,
+    })
+        .map((name) => (0, plugin_utils_1.winPath)((0, path_1.join)(absPagesPath, name))))
+        .filter((p) => localeFileMath.test((0, path_1.basename)(p)) && (0, fs_1.existsSync)(p))
+        .map((fullName) => {
+        var _a, _b;
+        const fileName = (0, path_1.basename)(fullName);
+        const fileInfo = (_b = (_a = localeFileMath
+            .exec(fileName)) === null || _a === void 0 ? void 0 : _a.slice(1, 3)) === null || _b === void 0 ? void 0 : _b.filter(Boolean);
+        return {
+            name: (fileInfo || []).join(separator),
+            path: fullName,
+        };
+    });
+    const groups = plugin_utils_1.lodash.groupBy(localeFiles, 'name');
+    const promises = Object.keys(groups).map(async (name) => {
+        const [lang, country = ''] = name.split(separator);
+        const { momentLocale } = (0, exports.getMomentLocale)(lang, country, resolveKey);
+        const antdLocale = plugin_utils_1.lodash
+            .uniq(await addAntdLocales({ lang, country }))
+            .filter((localePath) => modulesHasLocale(localePath));
+        return {
+            lang,
+            name,
+            // react-intl Function.supportedLocalesOf
+            // Uncaught RangeError: Incorrect locale information provided
+            locale: name.split(separator).join('-'),
+            country,
+            antdLocale,
+            paths: groups[name].map((item) => (0, plugin_utils_1.winPath)(item.path)),
+            momentLocale,
+        };
+    });
+    return Promise.all(promises);
+};
+exports.getLocaleList = getLocaleList;
+const exactLocalePaths = (data) => {
+    return plugin_utils_1.lodash.flatten(data.map((item) => item.paths));
+};
+exports.exactLocalePaths = exactLocalePaths;
+function isNeedPolyfill(targets = {}) {
+    // data come from https://caniuse.com/#search=intl
+    // you can find all browsers in https://github.com/browserslist/browserslist#browsers
+    const polyfillTargets = {
+        ie: 10,
+        firefox: 28,
+        chrome: 23,
+        safari: 9.1,
+        opera: 12.1,
+        ios: 9.3,
+        ios_saf: 9.3,
+        operamini: Infinity,
+        op_mini: Infinity,
+        android: 4.3,
+        blackberry: Infinity,
+        operamobile: 12.1,
+        op_mob: 12.1,
+        explorermobil: 10,
+        ie_mob: 10,
+        ucandroid: Infinity,
+    };
+    return (Object.keys(targets).find((key) => {
+        const lowKey = key.toLocaleLowerCase();
+        // @ts-ignore
+        return polyfillTargets[lowKey] && polyfillTargets[lowKey] >= targets[key];
+    }) !== undefined);
+}
+exports.isNeedPolyfill = isNeedPolyfill;

package/dist/utils/modelUtils.d.ts

@@ -0,0 +1,39 @@
+import * as t from '@umijs/bundler-utils/compiled/babel/types';
+import { IApi } from 'umi';
+interface IOpts {
+    contentTest?: (content: string) => Boolean;
+    astTest?: (opts: {
+        node: t.Node;
+        content: string;
+    }) => Boolean;
+}
+export declare class Model {
+    file: string;
+    namespace: string;
+    id: string;
+    exportName: string;
+    deps: string[];
+    constructor(file: string, sort: {} | undefined, id: number);
+    findDeps(sort: object): string[];
+}
+export declare class ModelUtils {
+    api: IApi;
+    opts: IOpts;
+    count: number;
+    constructor(api: IApi | null, opts: IOpts);
+    getAllModels(opts: {
+        sort?: object;
+        extraModels: string[];
+    }): Model[];
+    getSortedNamespaces(models: Model[]): string[];
+    getModels(opts: {
+        base: string;
+        pattern?: string;
+    }): string[];
+    isModelValid(opts: {
+        content: string;
+        file: string;
+    }): boolean;
+    static getModelsContent(models: Model[]): string;
+}
+export {};

package/dist/utils/modelUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelUtils.d.ts","sourceRoot":"","sources":["../../src/utils/modelUtils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,CAAC,MAAM,2CAA2C,CAAC;AAI/D,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAI3B,UAAU,KAAK;IACb,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IAC3C,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC;CAChE;AAED,qBAAa,KAAK;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,EAAE,CAAC;gBACH,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,SAAS,EAAE,EAAE,EAAE,MAAM;IAgB1D,QAAQ,CAAC,IAAI,EAAE,MAAM;CAiCtB;AAED,qBAAa,UAAU;IACrB,GAAG,EAAE,IAAI,CAAC;IACV,IAAI,EAAE,KAAK,CAAM;IACjB,KAAK,EAAE,MAAM,CAAK;gBACN,GAAG,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,EAAE,KAAK;IAKzC,YAAY,CAAC,IAAI,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAE;IAsC3D,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE;IA6CnC,SAAS,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAelD,YAAY,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;IAsCpD,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,KAAK,EAAE;CAsBxC"}

package/dist/utils/modelUtils.js

@@ -0,0 +1,231 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModelUtils = exports.Model = void 0;
+const parser = __importStar(require("@umijs/bundler-utils/compiled/babel/parser"));
+const traverse_1 = __importDefault(require("@umijs/bundler-utils/compiled/babel/traverse"));
+const t = __importStar(require("@umijs/bundler-utils/compiled/babel/types"));
+const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
+const astUtils_1 = require("./astUtils");
+class Model {
+    constructor(file, sort, id) {
+        let namespace;
+        let exportName;
+        const [_file, meta] = file.split('#');
+        if (meta) {
+            const metaObj = JSON.parse(meta);
+            namespace = metaObj.namespace;
+            exportName = metaObj.exportName;
+        }
+        this.file = _file;
+        this.id = `model_${id}`;
+        this.namespace = namespace || (0, path_1.basename)(file, (0, path_1.extname)(file));
+        this.exportName = exportName || 'default';
+        this.deps = sort ? this.findDeps(sort) : [];
+    }
+    findDeps(sort) {
+        const content = (0, fs_1.readFileSync)(this.file, 'utf-8');
+        // transform with esbuild first
+        // to reduce unexpected ast problem
+        const loader = (0, path_1.extname)(this.file).slice(1);
+        const result = (0, esbuild_1.transformSync)(content, {
+            loader,
+            sourcemap: false,
+            minify: false,
+        });
+        // transform with babel
+        const deps = new Set();
+        const ast = parser.parse(result.code, {
+            sourceType: 'module',
+            sourceFilename: this.file,
+            plugins: [],
+        });
+        // TODO: use sort
+        sort;
+        (0, traverse_1.default)(ast, {
+            CallExpression: (path) => {
+                if (t.isIdentifier(path.node.callee, { name: 'useModel' }) &&
+                    t.isStringLiteral(path.node.arguments[0])) {
+                    deps.add(path.node.arguments[0].value);
+                }
+            },
+        });
+        return [...deps];
+    }
+}
+exports.Model = Model;
+class ModelUtils {
+    constructor(api, opts) {
+        this.opts = {};
+        this.count = 1;
+        this.api = api;
+        this.opts = opts;
+    }
+    getAllModels(opts) {
+        // reset count
+        this.count = 1;
+        const models = [
+            ...this.getModels({
+                base: (0, path_1.join)(this.api.paths.absSrcPath, 'models'),
+                pattern: '**/*.{ts,tsx,js,jsx}',
+            }),
+            ...this.getModels({
+                base: (0, path_1.join)(this.api.paths.absPagesPath),
+                pattern: '**/models/**/*.{ts,tsx,js,jsx}',
+            }),
+            ...this.getModels({
+                base: (0, path_1.join)(this.api.paths.absPagesPath),
+                pattern: '**/model.{ts,tsx,js,jsx}',
+            }),
+            ...opts.extraModels,
+        ].map((file) => {
+            return new Model(file, opts.sort, this.count++);
+        });
+        // check duplicate
+        const namespaces = models.map((model) => model.namespace);
+        if (new Set(namespaces).size !== namespaces.length) {
+            throw new Error(`Duplicate namespace in models: ${namespaces.join(', ')}`);
+        }
+        // sort models by deps
+        if (opts.sort) {
+            const namespaces = this.getSortedNamespaces(models);
+            models.sort((a, b) => namespaces.indexOf(a.namespace) - namespaces.indexOf(b.namespace));
+        }
+        return models;
+    }
+    getSortedNamespaces(models) {
+        let final = [];
+        models.forEach((model, index) => {
+            const { deps, namespace } = model;
+            if (deps && deps.length) {
+                const itemGroup = [...deps, namespace];
+                const cannotUse = [namespace];
+                for (let i = 0; i <= index; i += 1) {
+                    if (models[i].deps.filter((v) => cannotUse.includes(v)).length) {
+                        if (!cannotUse.includes(models[i].namespace)) {
+                            cannotUse.push(models[i].namespace);
+                            i = -1;
+                        }
+                    }
+                }
+                const errorList = deps.filter((v) => cannotUse.includes(v));
+                if (errorList.length) {
+                    throw Error(`Circular dependencies: ${namespace} can't use ${errorList.join(', ')}`);
+                }
+                const intersection = final.filter((v) => itemGroup.includes(v));
+                if (intersection.length) {
+                    // first intersection
+                    const finalIndex = final.indexOf(intersection[0]);
+                    // replace with groupItem
+                    final = final
+                        .slice(0, finalIndex)
+                        .concat(itemGroup)
+                        .concat(final.slice(finalIndex + 1));
+                }
+                else {
+                    final.push(...itemGroup);
+                }
+            }
+            if (!final.includes(namespace)) {
+                // first occurrence append to the end
+                final.push(namespace);
+            }
+        });
+        return [...new Set(final)];
+    }
+    getModels(opts) {
+        return plugin_utils_1.glob
+            .sync(opts.pattern || '**/*.{ts,js}', {
+            cwd: opts.base,
+            absolute: true,
+        })
+            .map(plugin_utils_1.winPath)
+            .filter((file) => {
+            if (/\.d.ts$/.test(file))
+                return false;
+            if (/\.(test|e2e|spec).([jt])sx?$/.test(file))
+                return false;
+            const content = (0, fs_1.readFileSync)(file, 'utf-8');
+            return this.isModelValid({ content, file });
+        });
+    }
+    isModelValid(opts) {
+        const { file, content } = opts;
+        if (this.opts.contentTest && this.opts.contentTest(content)) {
+            return true;
+        }
+        // transform with esbuild first
+        // to reduce unexpected ast problem
+        const loader = (0, path_1.extname)(file).slice(1);
+        const result = (0, esbuild_1.transformSync)(content, {
+            loader,
+            sourcemap: false,
+            minify: false,
+        });
+        // transform with babel
+        let ret = false;
+        const ast = parser.parse(result.code, {
+            sourceType: 'module',
+            sourceFilename: file,
+            plugins: [],
+        });
+        (0, traverse_1.default)(ast, {
+            ExportDefaultDeclaration: (path) => {
+                let node = path.node.declaration;
+                node = (0, astUtils_1.getIdentifierDeclaration)(node, path);
+                if (this.opts.astTest && this.opts.astTest({ node, content })) {
+                    ret = true;
+                }
+            },
+        });
+        return ret;
+    }
+    static getModelsContent(models) {
+        const imports = [];
+        const modelProps = [];
+        models.forEach((model) => {
+            if (model.exportName !== 'default') {
+                imports.push(`import { ${model.exportName} as ${model.id} } from '${model.file}';`);
+            }
+            else {
+                imports.push(`import ${model.id} from '${model.file}';`);
+            }
+            modelProps.push(`${model.id}: { namespace: '${model.namespace}', model: ${model.id} },`);
+        });
+        return `
+${imports.join('\n')}
+
+export const models = {
+${modelProps.join('\n')}
+}`;
+    }
+}
+exports.ModelUtils = ModelUtils;

package/dist/utils/resolveProjectDep.d.ts

@@ -0,0 +1,5 @@
+export declare function resolveProjectDep(opts: {
+    pkg: any;
+    cwd: string;
+    dep: string;
+}): string | undefined;

package/dist/utils/resolveProjectDep.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveProjectDep.d.ts","sourceRoot":"","sources":["../../src/utils/resolveProjectDep.ts"],"names":[],"mappings":"AAGA,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,GAAG,EAAE,GAAG,CAAC;IACT,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,sBAWA"}

package/dist/utils/resolveProjectDep.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveProjectDep = void 0;
+const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
+function resolveProjectDep(opts) {
+    var _a, _b;
+    if (((_a = opts.pkg.dependencies) === null || _a === void 0 ? void 0 : _a[opts.dep]) ||
+        ((_b = opts.pkg.devDependencies) === null || _b === void 0 ? void 0 : _b[opts.dep])) {
+        return (0, path_1.dirname)(plugin_utils_1.resolve.sync(`${opts.dep}/package.json`, {
+            basedir: opts.cwd,
+        }));
+    }
+}
+exports.resolveProjectDep = resolveProjectDep;

package/dist/utils/withTmpPath.d.ts

@@ -0,0 +1,6 @@
+import { IApi } from 'umi';
+export declare function withTmpPath(opts: {
+    api: IApi;
+    path: string;
+    noPluginDir?: boolean;
+}): string;

package/dist/utils/withTmpPath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"withTmpPath.d.ts","sourceRoot":"","sources":["../../src/utils/withTmpPath.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAG3B,wBAAgB,WAAW,CAAC,IAAI,EAAE;IAChC,GAAG,EAAE,IAAI,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,UAUA"}

package/dist/utils/withTmpPath.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withTmpPath = void 0;
+const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
+function withTmpPath(opts) {
+    return (0, plugin_utils_1.winPath)((0, path_1.join)(opts.api.paths.absTmpPath, opts.api.plugin.key && !opts.noPluginDir
+        ? `plugin-${opts.api.plugin.key}`
+        : '', opts.path));
+}
+exports.withTmpPath = withTmpPath;

package/libs/qiankun/master/MicroApp.tsx

@@ -139,6 +139,13 @@ export const MicroApp = forwardRef(
       setComponentError(null);
       setLoading(true);
       const configuration = {
+        fetch(url) {
+          return window.fetch(url, {
+            headers: {
+              accept: 'text/html',
+            },
+          });
+        },
         globalContext: window,
         ...globalSettings,
         ...settingsFromProps,

package/libs/qiankun/master/common.ts

@@ -5,7 +5,7 @@
  * @since 2019-06-20
  */
 
-import { ReactComponentElement } from 'react';
+import React, { ReactComponentElement } from 'react';
 import type { IRouteProps } from 'umi';
 
 export const defaultMountContainerId = 'root-subapp';
@@ -63,9 +63,9 @@ export function patchMicroAppRoute(
   const microAppProps =
     route[`${routeBindingAlias}Props`] || route.microAppProps || {};
   if (microAppName) {
-    if (route.routes?.length) {
-      const childrenRouteHasComponent = route.routes.some(
-        (r: any) => r.component,
+    if (route.children?.length) {
+      const childrenRouteHasComponent = route.children.some(
+        (r: any) => r.element,
       );
       if (childrenRouteHasComponent) {
         throw new Error(
@@ -74,7 +74,10 @@ export function patchMicroAppRoute(
       }
     }
 
-    route.exact = false;
+    // 自动追加通配符，匹配子应用的路由
+    if (!route.path.endsWith('/*')) {
+      route.path = route.path.replace(/\/?$/, '/*');
+    }
 
     const { settings = {}, ...componentProps } = microAppProps;
     const routeProps = {
@@ -88,7 +91,7 @@ export function patchMicroAppRoute(
       masterHistoryType,
       routeProps,
     };
-    route.component = getMicroAppRouteComponent(opts);
+    route.element = React.createElement(getMicroAppRouteComponent(opts), null);
   }
 }
 
@@ -100,8 +103,8 @@ const recursiveSearch = (
     if (routes[i].path === path) {
       return routes[i];
     }
-    if (routes[i].routes && routes[i].routes?.length) {
-      const found = recursiveSearch(routes[i].routes || [], path);
+    if (routes[i].chidlren && routes[i].chidlren?.length) {
+      const found = recursiveSearch(routes[i].chidlren || [], path);
       if (found) {
         return found;
       }
@@ -123,8 +126,8 @@ export function insertRoute(routes: IRouteProps[], microAppRoute: IRouteProps) {
       );
     }
     found.exact = false;
-    found.routes = found.routes || [];
-    found.routes.push(microAppRoute);
+    found.chidlren = found.chidlren || [];
+    found.chidlren.push(microAppRoute);
   } else {
     throw new Error(
       `[plugin-qiankun]: path "${microAppRoute.insert}" not found`,

package/libs/qiankun/master/getMicroAppRouteComponent.tsx.tpl

@@ -1,6 +1,6 @@
 import React from 'react';
 import { MicroApp } from './MicroApp';
-import { useLocation } from 'umi';
+import { useRouteData } from 'umi';
 
 export function getMicroAppRouteComponent(opts: {
   appName: string;
@@ -9,14 +9,14 @@ export function getMicroAppRouteComponent(opts: {
   routeProps?: any;
 }) {
   const { base, masterHistoryType, appName, routeProps } = opts;
-  const RouteComponent = ({ match }: any) => {
-    const url = useLocation().pathname;
+  const RouteComponent = () => {
+    const { route } = useRouteData();
 
     // 默认取静态配置的 base
     let umiConfigBase = base === '/' ? '' : base;
 
-    let runtimeMatchedBase =
-      umiConfigBase + (url.endsWith('/') ? url.substr(0, url.length - 1) : url);
+    // 拼接子应用挂载路由
+    let runtimeMatchedBase = umiConfigBase + route.path.replace('/*', '');
 
     {{#dynamicRoot}}
     // @see https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/htmlUtils.ts#L102

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -34,10 +34,10 @@ function patchMicroAppRouteComponent(routes: any[]) {
     const rootRoute = routes.find((route) => route.path === '/');
     if (rootRoute) {
       // 如果根路由是叶子节点，则直接返回其父节点
-      if (!rootRoute.routes) {
+      if (!rootRoute.chidlren) {
         return routes;
       }
-      return getRootRoutes(rootRoute.routes);
+      return getRootRoutes(rootRoute.chidlren);
     }
     return routes;
   };
@@ -53,8 +53,8 @@ function patchMicroAppRouteComponent(routes: any[]) {
           masterHistoryType,
           routeBindingAlias,
         });
-        if (route.routes?.length) {
-          route.routes.forEach(patchRoute);
+        if (route.chidlren?.length) {
+          route.chidlren.forEach(patchRoute);
         }
       };
 
@@ -123,7 +123,7 @@ export async function render(oldRender: typeof noop) {
   }
 }
 
-export function patchRoutes({ routes }: { routes: any[] }) {
+export function patchClientRoutes({ routes }: { routes: any[] }) {
   if (microAppRuntimeRoutes) {
     patchMicroAppRouteComponent(routes);
   }

package/libs/qiankun/slave/connectMaster.tsx

@@ -1,5 +1,4 @@
 // @ts-nocheck
-/* eslint-disable */
 __USE_MODEL__;
 import React from 'react';