@umijs/plugins 4.0.0-beta.14 → 4.0.0-beta.18

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

@@ -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
-                (0, assert_1.default)(allIcons[upperIcon], `Icon ${upperIcon} is not found`);
-                memo[upperIcon] = true;
+                allIcons[upperIcon] || allIcons[`${upperIcon}Outlined`], `Icon ${upperIcon} is not found`);
+                // @ts-ignore
+                if (allIcons[upperIcon]) {
+                    memo[upperIcon] = true;
+                }
                 // @ts-ignore
                 if (allIcons[`${upperIcon}Outlined`]) {
                     memo[`${upperIcon}Outlined`] = true;
@@ -448,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.js

@@ -186,8 +186,8 @@ exports.default = (api) => {
         api.writeTmpFile({
             path: 'index.ts',
             content: `
-export * from './localeExports.ts';
-export * from './SelectLang.tsx';
+export { useIntl, formatMessage, FormattedMessage } from './localeExports.ts';
+export { SelectLang } from './SelectLang.tsx';
 `,
         });
     }));

package/dist/qiankun/master.js

@@ -22,9 +22,7 @@ exports.default = (api) => {
     api.addRuntimePlugin(() => {
         return [(0, withTmpPath_1.withTmpPath)({ api, path: 'masterRuntimePlugin.tsx' })];
     });
-    api.modifyDefaultConfig((config) => (Object.assign(Object.assign({}, config), { 
-        // TODO: support mountElementId
-        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) }) })));
+    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) => {
@@ -50,7 +48,7 @@ exports.default = (api) => {
     api.register({
         key: 'addExtraModels',
         fn() {
-            const [path, exports] = api.appData.appJS || [];
+            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}"}`,

package/dist/qiankun/slave.js

@@ -38,7 +38,6 @@ exports.default = (api) => {
         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), { 
             // 默认开启 runtimePublicPath，避免出现 dynamic import 场景子应用资源地址出问题
-            // TODO: runtimePublicPath
             runtimePublicPath: true, 
             // TODO: runtimeHistory
             runtimeHistory: {}, qiankun: Object.assign(Object.assign({}, memo.qiankun), { slave: initialSlaveOptions }) });
@@ -84,8 +83,8 @@ exports.default = (api) => {
         $('script').each((_, el) => {
             var _a;
             const scriptEl = $(el);
-            const umiEntryJs = /\/?umi(\.\w+)?\.js$/g;
-            if (umiEntryJs.test((_a = scriptEl.attr('src')) !== null && _a !== void 0 ? _a : '')) {
+            const umiEntry = /\/?umi(\.\w+)?\.js$/g;
+            if (umiEntry.test((_a = scriptEl.attr('src')) !== null && _a !== void 0 ? _a : '')) {
                 scriptEl.attr('entry', '');
             }
         });

package/dist/request.js

@@ -15,9 +15,9 @@ exports.default = (api) => {
     api.addRuntimePluginKey(() => ['request']);
     const requestTpl = `
 import axios, {
-  AxiosInstance,
-  AxiosRequestConfig,
-  AxiosResponse,
+  type AxiosInstance,
+  type AxiosRequestConfig,
+  type AxiosResponse,
 } from '{{{axiosPath}}}';
 import useUmiRequest, { UseRequestProvider } from '{{{umiRequestPath}}}';
 import { message, notification } from '{{{antdPkg}}}';
@@ -39,7 +39,7 @@ import {
   PaginatedOptionsWithFormat,
   PaginatedParams,
   PaginatedResult,
-} from '{{{umiRequestPath}}}/lib/types';
+} from '{{{umiRequestPath}}}/es/types';
 
 type ResultWithData< T = any > = { data?: T; [key: string]: any };
 
@@ -290,7 +290,11 @@ export {
         api.writeTmpFile({
             path: 'index.ts',
             content: `
-export * from './request';
+export {
+  useRequest,
+  UseRequestProvider,
+  request,
+} from './request';
 `,
         });
     });

package/dist/tailwindcss.d.ts

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

package/dist/tailwindcss.js

@@ -0,0 +1,38 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+const path = __importStar(require("path"));
+exports.default = (api) => {
+    api.describe({ key: 'tailwindcss' });
+    api.onStart(() => {
+        const inputPath = path.resolve(api.cwd, 'tailwind.css');
+        const generatedPath = path.resolve(api.paths.absTmpPath, 'tailwind.css');
+        const binPath = path.resolve(api.cwd, 'node_modules/.bin/tailwind');
+        /** 透过子进程建立 tailwindcss 服务，将生成的 css 写入 generatedPath */
+        const tailwind = (0, child_process_1.exec)(`${binPath} -i ${inputPath} -o ${generatedPath} --watch`, { cwd: api.cwd });
+        tailwind.on('error', (m) => {
+            api.logger.error('tailwindcss service encounter an error: ' + m);
+        });
+        /** 将生成的 css 文件加入到 import 中 */
+        api.addEntryImports(() => [{ source: generatedPath }]);
+    });
+};

package/dist/unocss.d.ts

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

package/dist/unocss.js

@@ -0,0 +1,57 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 });
+const utils_1 = require("@umijs/utils");
+const child_process_1 = require("child_process");
+const fs = __importStar(require("fs"));
+const path_1 = __importDefault(require("path"));
+exports.default = (api) => {
+    api.describe({
+        key: 'unocss',
+        config: {
+            schema(Joi) {
+                return Joi.object({
+                    watch: Joi.array(),
+                });
+            },
+        },
+        enableBy: api.EnableBy.config,
+    });
+    api.onStart(() => {
+        /** 由于 @unocss/cli 对设置文件进行了检查，因此加入需要 unocss.config.ts 设置的提示
+         * https://github.com/antfu/unocss/blob/main/packages/cli/src/index.ts#L93 */
+        if (!fs.existsSync(path_1.default.resolve(api.paths.cwd, 'unocss.config.ts')))
+            utils_1.logger.warn('请在项目目录中添加 unocss.config.ts 文件，并配置需要的 unocss presets，否则插件将没有效果！');
+        const generatedPath = path_1.default.resolve(api.paths.absTmpPath, 'uno.css');
+        const binPath = path_1.default.resolve(api.cwd, 'node_modules/.bin/unocss');
+        const watchDirs = api.config.unocss.watch;
+        /** 透过子进程建立 unocss 服务，将生成的 css 写入 generatedPath */
+        const unocss = (0, child_process_1.exec)(`${binPath} ${watchDirs.join(' ')} --out-file ${generatedPath} --watch`, { cwd: api.cwd });
+        unocss.on('error', (m) => {
+            api.logger.error('unocss service encounter an error: ' + m);
+        });
+        /** 将生成的 css 文件加入到 import 中 */
+        api.addEntryImports(() => [{ source: generatedPath }]);
+    });
+};

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -46,10 +46,7 @@ function patchMicroAppRouteComponent(routes: any[]) {
   if (rootRoutes) {
     const { routeBindingAlias, base, masterHistoryType } =
       getMasterOptions() as MasterOptions;
-    const microAppAttachedRoutes = microAppRuntimeRoutes.filter(
-      (r) => !r.insert,
-    );
-    microAppAttachedRoutes.reverse().forEach((microAppRoute) => {
+    microAppRuntimeRoutes.reverse().forEach((microAppRoute) => {
       const patchRoute = (route: any) => {
         patchMicroAppRoute(route, getMicroAppRouteComponent, {
           base,
@@ -62,7 +59,7 @@ function patchMicroAppRouteComponent(routes: any[]) {
       };
 
       patchRoute(microAppRoute);
-      rootRoutes.unshift(microAppRoute);
+      !microAppRoute.insert && rootRoutes.unshift(microAppRoute);
     });
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-beta.14",
+  "version": "4.0.0-beta.18",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -24,7 +24,7 @@
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.31.7",
-    "@umijs/bundler-utils": "4.0.0-beta.14",
+    "@umijs/bundler-utils": "4.0.0-beta.18",
     "antd": "^4.17.3",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.24.0",
@@ -42,7 +42,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-beta.14"
+    "umi": "4.0.0-beta.18"
   },
   "publishConfig": {
     "access": "public"