@umijs/plugins 4.0.0-beta.13 → 4.0.0-beta.17

package/README.md

@@ -1,3 +1,6 @@
 # @umijs/plugins
 
-See our website [umijs](https://umijs.org) for more information.
+See our website [umijs](https://umijs.org) for more information.
+
+
+

package/dist/antd.js

@@ -52,7 +52,7 @@ exports.default = (api) => {
     // babel-plugin-import
     api.addExtraBabelPlugins(() => {
         const style = api.config.antd.style || 'less';
-        return api.config.antd.import
+        return api.config.antd.import && !api.appData.vite
             ? [
                 [
                     require.resolve('babel-plugin-import'),
@@ -102,7 +102,7 @@ export function rootContainer(container) {
     // import antd style if antd.import is not configured
     api.addEntryImportsAhead(() => {
         const style = api.config.antd.style || 'less';
-        return api.config.antd.import
+        return api.config.antd.import && !api.appData.vite
             ? []
             : [
                 {

package/dist/dva.js

@@ -47,7 +47,7 @@ exports.default = (api) => {
     });
     api.modifyConfig((memo) => {
         // import from dva
-        memo.alias.dva = pkgPath;
+        memo.alias['dva$'] = pkgPath;
         return memo;
     });
     api.onGenerateFiles((args) => {
@@ -67,16 +67,15 @@ exports.default = (api) => {
 // aliased to @umijs/plugins/templates/dva
 import { create, Provider } from 'dva';
 import React, { useRef } from 'react';
-import { useAppData } from 'umi';
+import { history } from 'umi';
 import { models } from './models';
 
 export function RootContainer(props: any) {
-  const { navigator } = useAppData();
   const app = useRef<any>();
   if (!app.current) {
     app.current = create(
       {
-        history: navigator,
+        history,
       },
       {
         initialReducer: {},
@@ -84,7 +83,7 @@ export function RootContainer(props: any) {
           return [...middlewares];
         },
         setupApp(app: IDvaApp) {
-          app._history = navigator;
+          app._history = history;
         },
       },
     );

package/dist/layout.js

@@ -74,6 +74,13 @@ ${hasInitialStatePlugin
                 ? `import { useModel } from '@@/plugin-model';`
                 : 'const useModel = null;'}
 
+${api.config.locale
+                ? `
+import { useIntl } from '@@/plugin-locale';
+    `.trim()
+                : ''}
+
+
 export default () => {
   const location = useLocation();
   const navigate = useNavigate();
@@ -85,16 +92,26 @@ export default () => {
   };
   const { initialState, loading, setInitialState } = initialInfo;
   const userConfig = ${JSON.stringify(api.config.layout, null, 2)};
+${api.config.locale
+                ? `
+const { formatMessage } = useIntl();
+`.trim()
+                : 'const formatMessage = undefined;'}
   const runtimeConfig = pluginManager.applyPlugins({
     key: 'layout',
     type: 'modify',
-    initialValue: {},
+    initialValue: {
+      ...initialInfo
+    },
   });
+  const route = clientRoutes.filter(r => {
+    return r.id === 'ant-design-pro-layout';
+  })[0];
   return (
     <ProLayout
-      route={clientRoutes[0]}
+      route={route}
       location={location}
-      title={userConfig.name || 'plugin-layout'}
+      title={userConfig.title || 'plugin-layout'}
       navTheme="dark"
       siderWidth={256}
       onMenuHeaderClick={(e) => {
@@ -102,6 +119,7 @@ export default () => {
         e.preventDefault();
         navigate('/');
       }}
+      formatMessage={userConfig.formatMessage || formatMessage}
       menu={{ locale: userConfig.locale }}
       logo={Logo}
       menuItemRender={(menuItemProps, defaultDom) => {
@@ -154,9 +172,13 @@ export default () => {
             const { icon } = api.appData.routes[id];
             if (icon) {
                 const upperIcon = plugin_utils_1.lodash.upperFirst(plugin_utils_1.lodash.camelCase(icon));
+                (0, assert_1.default)(
+                // @ts-ignore
+                allIcons[upperIcon] || allIcons[`${upperIcon}Outlined`], `Icon ${upperIcon} is not found`);
                 // @ts-ignore
-                (0, assert_1.default)(allIcons[upperIcon], `Icon ${upperIcon} is not found`);
-                memo[upperIcon] = true;
+                if (allIcons[upperIcon]) {
+                    memo[upperIcon] = true;
+                }
                 // @ts-ignore
                 if (allIcons[`${upperIcon}Outlined`]) {
                     memo[`${upperIcon}Outlined`] = true;
@@ -203,13 +225,13 @@ export function patchRoutes({ routes }) {
 }
       `,
         });
-        // rightRender.tsx
-        api.writeTmpFile({
-            path: 'rightRender.tsx',
-            content: `
+        const rightRenderContent = `
 import React from 'react';
 import { Avatar, Dropdown, Menu, Spin } from 'antd';
 import { LogoutOutlined } from '@ant-design/icons';
+{{#Locale}}
+import { SelectLang } from '@@/plugin-locale';
+{{/Locale}}
 
 export function getRightRenderContent (opts: {
    runtimeConfig: any,
@@ -257,7 +279,7 @@ export function getRightRenderContent (opts: {
   if (opts.loading) {
     return (
       <div className="umi-plugin-layout-right">
-        <Spin size="small" style={{ marginLeft: 8, marginRight: 8 }} />
+        <Spin size="small" style={ { marginLeft: 8, marginRight: 8 } } />
       </div>
     );
   }
@@ -271,11 +293,20 @@ export function getRightRenderContent (opts: {
       ) : (
         avatar
       )}
+{{#Locale}}
+      <SelectLang />
+{{/Locale}}
     </div>
   );
-  // TODO: <SelectLang />
 }
-      `,
+      `;
+        const Locale = api.isPluginEnable('locale');
+        // rightRender.tsx
+        api.writeTmpFile({
+            path: 'rightRender.tsx',
+            content: plugin_utils_1.Mustache.render(rightRenderContent, {
+                Locale,
+            }),
         });
         // Layout.less
         api.writeTmpFile({
@@ -301,7 +332,7 @@ export function getRightRenderContent (opts: {
   }
 }
 .umi-plugin-layout-right {
-  display: flex;
+  display: flex !important;
   float: right;
   height: 100%;
   margin-left: auto;
@@ -439,6 +470,9 @@ export default LogoIcon;
             {
                 id: 'ant-design-pro-layout',
                 file: (0, withTmpPath_1.withTmpPath)({ api, path: 'Layout.tsx' }),
+                test: (route) => {
+                    return route.layout !== false;
+                },
             },
         ];
     });

package/dist/locale.d.ts

@@ -1,3 +1,4 @@
 import { IApi } from 'umi';
+export declare const packageNormalize: (packageName: string) => string;
 declare const _default: (api: IApi) => void;
 export default _default;

package/dist/locale.js

@@ -1,5 +1,203 @@
 "use strict";
+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 });
+exports.packageNormalize = void 0;
+const utils_1 = require("@umijs/utils");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const localeUtils_1 = require("./utils/localeUtils");
+const withTmpPath_1 = require("./utils/withTmpPath");
+const packageNormalize = (packageName) => packageName.replace(/[@\/\-.]/g, '_');
+exports.packageNormalize = packageNormalize;
+// TODO: runtime plugin
 exports.default = (api) => {
-    api;
+    var _a;
+    // TODO: antd 的校验考虑 antd 插件
+    let hasAntd = false;
+    try {
+        hasAntd = !!require.resolve('antd');
+    }
+    catch (e) {
+        api.logger.warn('antd is not installed. <SelecLang /> unavailable');
+    }
+    api.describe({
+        key: 'locale',
+        config: {
+            default: {
+                baseNavigator: true,
+                useLocalStorage: true,
+                baseSeparator: '-',
+                antd: hasAntd,
+            },
+            schema(joi) {
+                return joi.object({
+                    default: joi.string(),
+                    useLocalStorage: joi.boolean(),
+                    baseNavigator: joi.boolean(),
+                    title: joi.boolean(),
+                    antd: joi.boolean(),
+                    baseSeparator: joi.string(),
+                });
+            },
+        },
+        enableBy: api.EnableBy.config,
+    });
+    const reactIntlPkgPath = (0, path_1.dirname)(require.resolve('react-intl/package'));
+    // polyfill
+    if ((0, localeUtils_1.isNeedPolyfill)(((_a = api.userConfig) === null || _a === void 0 ? void 0 : _a.targets) || {})) {
+        api.addEntryImportsAhead(() => [
+            {
+                source: require.resolve('intl'),
+            },
+        ]);
+    }
+    const addAntdLocales = (args) => __awaiter(void 0, void 0, void 0, function* () {
+        var _b;
+        return yield api.applyPlugins({
+            key: 'addAntdLocales',
+            type: api.ApplyPluginsType.add,
+            initialValue: [
+                `antd/${((_b = api.config) === null || _b === void 0 ? void 0 : _b.ssr) ? 'lib' : 'es'}/locale/${(0, localeUtils_1.getAntdLocale)(args.lang, args.country)}`,
+            ],
+            args,
+        });
+    });
+    const getList = (resolveKey) => __awaiter(void 0, void 0, void 0, function* () {
+        var _c, _d;
+        const { paths } = api;
+        return (0, localeUtils_1.getLocaleList)({
+            localeFolder: ((_c = api.config) === null || _c === void 0 ? void 0 : _c.singular) ? 'locale' : 'locales',
+            separator: (_d = api.config.locale) === null || _d === void 0 ? void 0 : _d.baseSeparator,
+            absSrcPath: paths.absSrcPath,
+            absPagesPath: paths.absPagesPath,
+            addAntdLocales,
+            resolveKey,
+        });
+    });
+    api.onGenerateFiles(() => __awaiter(void 0, void 0, void 0, function* () {
+        var _e, _f, _g, _h;
+        const localeTpl = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../libs/locale/locale.tpl'), 'utf-8');
+        // moment2dayjs
+        const resolveKey = api.config.moment2dayjs ? 'dayjs' : 'moment';
+        const momentPkgPath = (0, path_1.dirname)(require.resolve(`${resolveKey}/package.json`));
+        const EventEmitterPkg = (0, path_1.dirname)(require.resolve('event-emitter/package'));
+        const { baseSeparator, baseNavigator, antd, title, useLocalStorage } = api
+            .config.locale;
+        const defaultLocale = ((_e = api.config.locale) === null || _e === void 0 ? void 0 : _e.default) || `zh${baseSeparator}CN`;
+        const localeList = yield getList(resolveKey);
+        const momentLocales = localeList
+            .map(({ momentLocale }) => momentLocale)
+            .filter((locale) => locale);
+        const antdLocales = localeList
+            .map(({ antdLocale }) => antdLocale)
+            .filter((locale) => locale);
+        let MomentLocales = momentLocales;
+        let DefaultMomentLocale = '';
+        // set moment default accounding to locale.default
+        if (!MomentLocales.length && ((_f = api.config.locale) === null || _f === void 0 ? void 0 : _f.default)) {
+            const [lang, country = ''] = defaultLocale.split(baseSeparator);
+            const { momentLocale } = (0, localeUtils_1.getMomentLocale)(lang, country, resolveKey);
+            if (momentLocale) {
+                MomentLocales = [momentLocale];
+                DefaultMomentLocale = momentLocale;
+            }
+        }
+        let DefaultAntdLocales = [];
+        // set antd default locale
+        if (!antdLocales.length && ((_g = api.config.locale) === null || _g === void 0 ? void 0 : _g.antd)) {
+            const [lang, country = ''] = defaultLocale.split(baseSeparator);
+            DefaultAntdLocales = utils_1.lodash.uniq(yield addAntdLocales({
+                lang,
+                country,
+            }));
+        }
+        const NormalizeAntdLocalesName = function () {
+            // @ts-ignore
+            return (0, exports.packageNormalize)(this);
+        };
+        api.writeTmpFile({
+            content: utils_1.Mustache.render(localeTpl, {
+                MomentLocales,
+                DefaultMomentLocale,
+                NormalizeAntdLocalesName,
+                DefaultAntdLocales,
+                Antd: !!antd,
+                Title: title && api.config.title,
+                BaseSeparator: baseSeparator,
+                DefaultLocale: defaultLocale,
+                DefaultLang: defaultLocale,
+                momentPkgPath,
+            }),
+            path: 'locale.tsx',
+        });
+        const localeExportsTpl = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../libs/locale/localeExports.tpl'), 'utf-8');
+        const localeDirName = api.config.singular ? 'locale' : 'locales';
+        const localeDirPath = (0, path_1.join)(api.paths.absSrcPath, localeDirName);
+        api.writeTmpFile({
+            path: 'localeExports.ts',
+            content: utils_1.Mustache.render(localeExportsTpl, {
+                EventEmitterPkg,
+                BaseSeparator: baseSeparator,
+                BaseNavigator: baseNavigator,
+                UseLocalStorage: !!useLocalStorage,
+                LocaleDir: localeDirName,
+                ExistLocaleDir: (0, fs_1.existsSync)(localeDirPath),
+                LocaleList: localeList.map((locale) => (Object.assign(Object.assign({}, locale), { antdLocale: locale.antdLocale.map((antdLocale, index) => ({
+                        locale: antdLocale,
+                        index: index,
+                    })), paths: locale.paths.map((path, index) => ({
+                        path,
+                        index,
+                    })) }))),
+                Antd: !!antd,
+                DefaultLocale: JSON.stringify(defaultLocale),
+                warningPkgPath: require.resolve('warning/package'),
+                reactIntlPkgPath,
+            }),
+        });
+        // runtime.tsx
+        const runtimeTpl = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../libs/locale/runtime.tpl'), 'utf-8');
+        api.writeTmpFile({
+            path: 'runtime.tsx',
+            content: utils_1.Mustache.render(runtimeTpl, {
+                Title: !!title,
+            }),
+        });
+        // SelectLang.tsx
+        const selectLang = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../libs/locale/SelectLang.tpl'), 'utf-8');
+        api.writeTmpFile({
+            path: 'SelectLang.tsx',
+            content: utils_1.Mustache.render(selectLang, {
+                Antd: !!antd,
+                LocaleList: localeList,
+                ShowSelectLang: localeList.length > 1 && !!antd,
+                antdFiles: ((_h = api.config) === null || _h === void 0 ? void 0 : _h.ssr) ? 'lib' : 'es',
+            }),
+        });
+        // index.ts
+        api.writeTmpFile({
+            path: 'index.ts',
+            content: `
+export { useIntl, formatMessage, FormattedMessage } from './localeExports.ts';
+export { SelectLang } from './SelectLang.tsx';
+`,
+        });
+    }));
+    // Runtime Plugin
+    api.addRuntimePlugin(() => [(0, withTmpPath_1.withTmpPath)({ api, path: 'runtime.tsx' })]);
+    api.addRuntimePluginKey(() => ['locale']);
+    // watch locale files
+    api.addTmpGenerateWatcherPaths(() => __awaiter(void 0, void 0, void 0, function* () {
+        const resolveKey = api.config.moment2dayjs ? 'dayjs' : 'moment';
+        const localeList = yield getList(resolveKey);
+        return (0, localeUtils_1.exactLocalePaths)(localeList);
+    }));
 };

package/dist/qiankun/constants.d.ts

@@ -0,0 +1,5 @@
+export declare const defaultMasterRootId = "root-master";
+export declare const defaultHistoryType = "browser";
+export declare const qiankunStateForSlaveModelNamespace = "@@qiankunStateForSlave";
+export declare const qiankunStateFromMasterModelNamespace = "@@qiankunStateFromMaster";
+export declare const MODEL_EXPORT_NAME = "useQiankunStateForSlave";

package/dist/qiankun/constants.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MODEL_EXPORT_NAME = exports.qiankunStateFromMasterModelNamespace = exports.qiankunStateForSlaveModelNamespace = exports.defaultHistoryType = exports.defaultMasterRootId = void 0;
+exports.defaultMasterRootId = 'root-master';
+exports.defaultHistoryType = 'browser';
+exports.qiankunStateForSlaveModelNamespace = '@@qiankunStateForSlave';
+exports.qiankunStateFromMasterModelNamespace = '@@qiankunStateFromMaster';
+exports.MODEL_EXPORT_NAME = 'useQiankunStateForSlave';

package/dist/qiankun/master.d.ts

@@ -0,0 +1,6 @@
+import { IApi } from 'umi';
+export declare function isMasterEnable(opts: {
+    userConfig: any;
+}): boolean;
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/qiankun/master.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isMasterEnable = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const withTmpPath_1 = require("../utils/withTmpPath");
+const constants_1 = require("./constants");
+function isMasterEnable(opts) {
+    var _a;
+    const masterCfg = (_a = opts.userConfig.qiankun) === null || _a === void 0 ? void 0 : _a.master;
+    if (masterCfg) {
+        return masterCfg.enable !== false;
+    }
+    return !!process.env.INITIAL_QIANKUN_MASTER_OPTIONS;
+}
+exports.isMasterEnable = isMasterEnable;
+exports.default = (api) => {
+    api.describe({
+        key: 'qiankun-master',
+        enableBy: isMasterEnable,
+    });
+    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.modifyRoutes((memo) => {
+        Object.keys(memo).forEach((id) => {
+            const route = memo[id];
+            if (route.microApp) {
+                const appName = route.microApp;
+                // TODO: config base
+                const base = '/';
+                // TODO: config masterHistoryType
+                const masterHistoryType = '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 memo;
+    });
+    // state model for slave app
+    api.addRuntimePluginKey(() => [constants_1.MODEL_EXPORT_NAME]);
+    api.register({
+        key: 'addExtraModels',
+        fn() {
+            const { path, exports } = api.appData.appJS || {};
+            return path && exports.includes(constants_1.MODEL_EXPORT_NAME)
+                ? [
+                    `${path}#{"namespace":"${constants_1.qiankunStateForSlaveModelNamespace}","exportName":"${constants_1.MODEL_EXPORT_NAME}"}`,
+                ]
+                : [];
+        },
+    });
+    function getFileContent(file) {
+        return (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../libs/qiankun/master', file), 'utf-8');
+    }
+    api.onGenerateFiles(() => {
+        var _a;
+        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))};
+export const getMasterOptions = () => options;
+export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts });
+      `,
+        });
+        api.writeTmpFile({
+            path: 'MicroAppLoader.tsx',
+            // 开启了 antd 插件的时候，使用 antd 的 loader 组件，否则提示用户必须设置一个自定义的 loader 组件
+            content: api.isPluginEnable('antd')
+                ? getFileContent('AntdLoader.tsx')
+                : `export default function Loader() { console.warn(\`[plugins/qiankun]: Seems like you'r not using @umijs/plugin-antd, you need to provide a custom loader or set autoSetLoading false to shut down this warning!\`); return null; }`,
+        });
+        [
+            'common.ts',
+            'constants.ts',
+            'types.ts',
+            'masterRuntimePlugin.tsx',
+            'getMicroAppRouteComponent.tsx.tpl',
+            'ErrorBoundary.tsx',
+            'MicroApp.tsx',
+        ].forEach((file) => {
+            if (file.endsWith('.tpl')) {
+                api.writeTmpFile({
+                    path: file.replace(/\.tpl$/, ''),
+                    tpl: getFileContent(file),
+                    context: {
+                        runtimeHistory: api.config.runtimeHistory,
+                        dynamicRoot: false,
+                        hasModelPlugin: api.isPluginEnable('model'),
+                        // dynamicRoot:
+                        //   api.config.exportStatic && api.config.exportStatic.dynamicRoot,
+                    },
+                });
+            }
+            else {
+                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, path_1.dirname)(require.resolve('qiankun/package'))}'`)
+                        .replace(/from 'lodash\//g, `from '${(0, path_1.dirname)(require.resolve('lodash/package'))}/`),
+                });
+            }
+        });
+    });
+};

package/dist/qiankun/slave.d.ts

@@ -0,0 +1,3 @@
+import { IApi } from 'umi';
+declare const _default: (api: IApi) => void;
+export default _default;