@umijs/plugins 4.0.0-rc.2 → 4.0.0-rc.20

package/dist/request.js

@@ -7,7 +7,12 @@ exports.default = (api) => {
         key: 'request',
         config: {
             schema: (joi) => {
-                return joi.object();
+                return joi.object({
+                    dataField: joi
+                        .string()
+                        .pattern(/^[a-zA-Z]*$/)
+                        .allow(''),
+                });
             },
         },
         enableBy: api.EnableBy.config,
@@ -20,7 +25,6 @@ import axios, {
   type AxiosResponse,
 } from '{{{axiosPath}}}';
 import useUmiRequest, { UseRequestProvider } from '{{{umiRequestPath}}}';
-import { message, notification } from '{{{antdPkg}}}';
 import { ApplyPluginsType } from 'umi';
 import { getPluginManager } from '../core/plugin';
 
@@ -81,7 +85,7 @@ function useRequest<Item = any, U extends Item = any>(
 ): PaginatedResult<Item>;
 function useRequest(service: any, options: any = {}) {
   return useUmiRequest(service, {
-    formatResult: result => result?.data,
+    formatResult: {{{formatResult}}},
     requestMethod: (requestOptions: any) => {
       if (typeof requestOptions === 'string') {
         return request(requestOptions);
@@ -96,114 +100,49 @@ function useRequest(service: any, options: any = {}) {
   });
 }
 
-export interface RequestConfig extends AxiosRequestConfig {
-  errorConfig?: {
-    errorPage?: string;
-    adaptor?: IAdaptor; // adaptor 用以用户将不满足接口的后端数据修改成 errorInfo
-    errorHandler?: IErrorHandler;
-    defaultNoneResponseErrorMessage?: string;
-    defaultRequestErrorMessage?: string;
-  };
-  formatResultAdaptor?: IFormatResultAdaptor;
-}
-
-export enum ErrorShowType {
-  SILENT = 0,
-  WARN_MESSAGE = 1,
-  ERROR_MESSAGE = 2,
-  NOTIFICATION = 3,
-  REDIRECT = 9,
-}
-
-export interface IErrorInfo {
-  success: boolean;
-  data?: any;
-  errorCode?: string;
-  errorMessage?: string;
-  showType?: ErrorShowType;
-  traceId?: string;
-  host?: string;
+// request 方法 opts 参数的接口
+interface IRequestOptions extends AxiosRequestConfig {
+  skipErrorHandler?: boolean;
+  requestInterceptors?: IRequestInterceptorTuple[];
+  responseInterceptors?: IResponseInterceptorTuple[];
   [key: string]: any;
 }
-// resData 其实就是 response.data, response 则是 axios 的响应对象
-interface IAdaptor {
-  (resData: any, response: AxiosResponse): IErrorInfo;
+
+interface IRequestOptionsWithResponse extends IRequestOptions {
+  getResponse: true;
 }
 
-export interface RequestError extends Error {
-  data?: any;
-  info?: IErrorInfo;
+interface IRequestOptionsWithoutResponse extends IRequestOptions{
+  getResponse: false;
 }
 
-interface IRequest {
-  (
-    url: string,
-    opts: AxiosRequestConfig & { skipErrorHandler?: boolean },
-  ): Promise<AxiosResponse<any, any>>;
+interface IRequest{
+   <T = any>(url: string, opts: IRequestOptionsWithResponse): Promise<AxiosResponse<T>>;
+   <T = any>(url: string, opts: IRequestOptionsWithoutResponse): Promise<T>;
+   <T = any>(url: string, opts: IRequestOptions): Promise<T>; // getResponse 默认是 false， 因此不提供该参数时，只返回 data
+   <T = any>(url: string): Promise<T>;  // 不提供 opts 时，默认使用 'GET' method，并且默认返回 data
 }
 
 interface IErrorHandler {
-  (error: RequestError, opts: AxiosRequestConfig & { skipErrorHandler?: boolean }, config: RequestConfig): void;
+  (error: RequestError, opts: IRequestOptions): void;
 }
+type IRequestInterceptorAxios = (config: RequestOptions) => RequestOptions;
+type IRequestInterceptorUmiRequest = (url: string, config : RequestOptions) => { url: string, options: RequestOptions };
+type IRequestInterceptor = IRequestInterceptorAxios;
+type IErrorInterceptor = (error: Error) => Promise<Error>;
+type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => AxiosResponse<T> ;
+type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [ IRequestInterceptor ] | IRequestInterceptor
+type IResponseInterceptorTuple = [IResponseInterceptor, IErrorInterceptor] | [IResponseInterceptor] | IResponseInterceptor
 
-interface IFormatResultAdaptor {
-  (res: AxiosResponse): any;
+export interface RequestConfig extends AxiosRequestConfig {
+  errorConfig?: {
+    errorHandler?: IErrorHandler;
+    errorThrower?: <T = any>( res: T ) => void
+  };
+  requestInterceptors?: IRequestInterceptorTuple[];
+  responseInterceptors?: IResponseInterceptorTuple[];
 }
 
-const defaultErrorHandler: IErrorHandler = (error, opts, config) => {
-  if (opts?.skipErrorHandler) throw error;
-  const { errorConfig } = config;
-  if (error.response) {
-    // 请求成功发出且服务器也响应了状态码，但状态代码超出了 2xx 的范围 或者 成功响应，success字段为false 由我们抛出的错误
-    let errorInfo: IErrorInfo | undefined;
-    // 不是我们的错误
-    if(error.name === 'ResponseError'){
-      const adaptor: IAdaptor =
-      errorConfig?.adaptor || ((errorData) => errorData);
-      errorInfo = adaptor(error.response.data, error.response);
-      error.info = errorInfo;
-      error.data = error.response.data;
-    }
-    errorInfo = error.info;
-    if (errorInfo) {
-      const { errorMessage, errorCode } = errorInfo;
-      switch (errorInfo.showType) {
-        case ErrorShowType.SILENT:
-          // do nothong
-          break;
-        case ErrorShowType.WARN_MESSAGE:
-          message.warn(errorMessage);
-          break;
-        case ErrorShowType.ERROR_MESSAGE:
-          message.error(errorMessage);
-          break;
-        case ErrorShowType.NOTIFICATION:
-          notification.open({ description: errorMessage, message: errorCode });
-          break;
-        case ErrorShowType.REDIRECT:
-          // TODO: redirect
-          break;
-        default:
-          message.error(errorMessage);
-      }
-    }
-  } else if (error.request) {
-    // 请求已经成功发起，但没有收到响应
-    // \`error.request\` 在浏览器中是 XMLHttpRequest 的实例，
-    // 而在node.js中是 http.ClientRequest 的实例
-    message.error(
-      errorConfig?.defaultNoneResponseErrorMessage ||
-        'None response! Please retry.',
-    );
-  } else {
-    // 发送请求时出了点问题
-    message.error(
-      errorConfig?.defaultRequestErrorMessage || 'Request error, please retry.',
-    );
-  }
-  throw error;
-};
-
 let requestInstance: AxiosInstance;
 let config: RequestConfig;
 const getConfig = (): RequestConfig => {
@@ -215,56 +154,118 @@ const getConfig = (): RequestConfig => {
   });
   return config;
 };
+
 const getRequestInstance = (): AxiosInstance => {
   if (requestInstance) return requestInstance;
   const config = getConfig();
   requestInstance = axios.create(config);
 
+  config?.requestInterceptors?.forEach((interceptor) => {
+    if(interceptor instanceof Array){
+      requestInstance.interceptors.request.use((config) => {
+        const { url } = config;
+        if(interceptor[0].length === 2){
+          const { url: newUrl, options } = interceptor[0](url, config);
+          return { ...options, url: newUrl };
+        }
+        return interceptor[0](config);
+      }, interceptor[1]);
+    } else {
+      requestInstance.interceptors.request.use((config) => {
+        const { url } = config;
+        if(interceptor.length === 2){
+          const { url: newUrl, options } = interceptor(url, config);
+          return { ...options, url: newUrl };
+        }
+        return interceptor(config);
+      })
+    }
+  });
+
+  config?.responseInterceptors?.forEach((interceptor) => {
+    interceptor instanceof Array ?
+      requestInstance.interceptors.response.use(interceptor[0], interceptor[1]):
+       requestInstance.interceptors.response.use(interceptor);
+  });
+
   // 当响应的数据 success 是 false 的时候，抛出 error 以供 errorHandler 处理。
-  requestInstance.interceptors.response.use((response)=>{
-    const {data} = response;
-    const adaptor = config?.errorConfig?.adaptor || ((resData) => resData);
-    const errorInfo = adaptor(data,response);
-    if(errorInfo.success === false){
-      const error: RequestError = new Error(errorInfo.errorMessage);
-      error.name = 'BizError';
-      error.data = data;
-      error.info = errorInfo;
-      error.response = response;
-      throw error;
+  requestInstance.interceptors.response.use((response) => {
+    const { data } = response;
+    if(data?.success === false && config?.errorConfig?.errorThrower){
+      config.errorConfig.errorThrower(data);
     }
     return response;
   })
   return requestInstance;
 };
 
-const request: IRequest = (url, opts) => {
+const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {
   const requestInstance = getRequestInstance();
   const config = getConfig();
-  return new Promise((resolve, reject) => {
+  const { getResponse = false, requestInterceptors, responseInterceptors } = opts;
+  const requestInterceptorsToEject = requestInterceptors?.map((interceptor) => {
+    if(interceptor instanceof Array){
+      return requestInstance.interceptors.request.use((config) => {
+        const { url } = config;
+        if(interceptor[0].length === 2){
+          const { url: newUrl, options } = interceptor[0](url, config);
+          return { ...options, url: newUrl };
+        }
+        return interceptor[0](config);
+      }, interceptor[1]);
+    } else {
+      return requestInstance.interceptors.request.use((config) => {
+        const { url } = config;
+        if(interceptor.length === 2){
+          const { url: newUrl, options } = interceptor(url, config);
+          return { ...options, url: newUrl };
+        }
+        return interceptor(config);
+      })
+    }
+    });
+  const responseInterceptorsToEject = responseInterceptors?.map((interceptor) => {
+    return interceptor instanceof Array ?
+      requestInstance.interceptors.response.use(interceptor[0], interceptor[1]):
+       requestInstance.interceptors.response.use(interceptor);
+    });
+  return new Promise((resolve, reject)=>{
     requestInstance
-      .request({ ...opts, url })
-      .then((res) => {
-        const formatResultAdaptor =
-          config?.formatResultAdaptor || ((res) => res.data);
-        resolve(formatResultAdaptor(res));
+      .request({...opts, url})
+      .then((res)=>{
+        requestInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.request.eject(interceptor);
+        });
+        responseInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.response.eject(interceptor);
+        });
+        resolve(getResponse ? res : res.data);
       })
-      .catch((error) => {
+      .catch((error)=>{
+        requestInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.request.eject(interceptor);
+        });
+        responseInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.response.eject(interceptor);
+        });
         try {
           const handler =
-            config.errorConfig?.errorHandler || defaultErrorHandler;
-          handler(error, opts, config);
+            config.errorConfig?.errorHandler;
+          if(handler)
+            handler(error, opts, config);
         } catch (e) {
           reject(e);
         }
-      });
-  });
-};
+        reject(error);
+      })
+  })
+}
 
 export {
   useRequest,
   UseRequestProvider,
   request,
+  getRequestInstance,
 };
 
 export type {
@@ -278,18 +279,24 @@ export type {
         var _a;
         const umiRequestPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('@ahooksjs/use-request/package.json')));
         const axiosPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('axios/package.json')));
-        const antdPkg = (0, plugin_utils_1.winPath)(
-        // use path from antd plugin first
-        ((_a = api.appData.antd) === null || _a === void 0 ? void 0 : _a.pkgPath) ||
-            (0, path_1.dirname)(require.resolve('antd/package.json')));
+        let dataField = (_a = api.config.request) === null || _a === void 0 ? void 0 : _a.dataField;
+        if (dataField === undefined)
+            dataField = 'data';
+        const formatResult = dataField === '' ? `result => result` : `result => result?.${dataField}`;
         api.writeTmpFile({
             path: 'request.ts',
             content: plugin_utils_1.Mustache.render(requestTpl, {
                 umiRequestPath,
                 axiosPath,
-                antdPkg,
+                formatResult,
             }),
         });
+        api.writeTmpFile({
+            path: 'types.d.ts',
+            content: `
+export type { RequestConfig } from './request';
+`,
+        });
         api.writeTmpFile({
             path: 'index.ts',
             content: `

package/dist/tailwindcss.js

@@ -1,38 +1,40 @@
 "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"));
+const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 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');
+    api.describe({
+        key: 'tailwindcss',
+        config: {
+            schema(Joi) {
+                return Joi.object();
+            },
+        },
+        enableBy: api.EnableBy.config,
+    });
+    let tailwind = null;
+    const outputPath = 'plugin-tailwindcss/tailwind.css';
+    api.onBeforeCompiler(() => {
+        const inputPath = (0, path_1.join)(api.cwd, 'tailwind.css');
+        const generatedPath = (0, path_1.join)(api.paths.absTmpPath, outputPath);
+        const binPath = (0, path_1.join)(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 = (0, plugin_utils_1.crossSpawn)(`${binPath}`, [
+            '-i',
+            inputPath,
+            '-o',
+            generatedPath,
+            api.env === 'development' ? '--watch' : '',
+        ], {
+            stdio: 'inherit',
+        });
         tailwind.on('error', (m) => {
             api.logger.error('tailwindcss service encounter an error: ' + m);
         });
-        /** 将生成的 css 文件加入到 import 中 */
-        api.addEntryImports(() => [{ source: generatedPath }]);
+    });
+    /** 将生成的 css 文件加入到 import 中 */
+    api.addEntryImports(() => {
+        const generatedPath = (0, plugin_utils_1.winPath)((0, path_1.join)(api.paths.absTmpPath, outputPath));
+        return [{ source: generatedPath }];
     });
 };

package/dist/unocss.js

@@ -1,31 +1,9 @@
 "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"));
+const fs_1 = require("fs");
+const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 exports.default = (api) => {
     api.describe({
         key: 'unocss',
@@ -38,20 +16,24 @@ exports.default = (api) => {
         },
         enableBy: api.EnableBy.config,
     });
-    api.onStart(() => {
+    const outputPath = 'uno.css';
+    api.onBeforeCompiler(() => {
         /** 由于 @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');
+        if (!(0, fs_1.existsSync)((0, path_1.join)(api.paths.cwd, 'unocss.config.ts')))
+            api.logger.warn('请在项目目录中添加 unocss.config.ts 文件，并配置需要的 unocss presets，否则插件将没有效果！');
+        const generatedPath = (0, path_1.join)(api.paths.absTmpPath, outputPath);
+        const binPath = (0, path_1.join)(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 });
+        const unocss = (0, child_process_1.exec)(`${binPath} ${watchDirs.join(' ')} --out-file ${generatedPath} ${api.env === 'development' ? '--watch' : ''}`, { cwd: api.cwd });
         unocss.on('error', (m) => {
             api.logger.error('unocss service encounter an error: ' + m);
         });
-        /** 将生成的 css 文件加入到 import 中 */
-        api.addEntryImports(() => [{ source: generatedPath }]);
+    });
+    /** 将生成的 css 文件加入到 import 中 */
+    api.addEntryImports(() => {
+        const generatedPath = (0, plugin_utils_1.winPath)((0, path_1.join)(api.paths.absTmpPath, outputPath));
+        return [{ source: generatedPath }];
     });
 };

package/dist/utils/astUtils.js

@@ -1,7 +1,11 @@
 "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]; } });
+    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];

package/dist/utils/localeUtils.js

@@ -1,18 +1,9 @@
 "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.isNeedPolyfill = exports.exactLocalePaths = exports.getLocaleList = exports.getAntdLocale = exports.getMomentLocale = void 0;
-const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 /**
  * 获取 moment 包的 locale 名称
  * @param lang 语言
@@ -55,19 +46,19 @@ const modulesHasLocale = (localePath) => {
         return false;
     }
 };
-const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
+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 = utils_1.glob
+    const localeFiles = plugin_utils_1.glob
         .sync('*.{ts,js,json}', {
-        cwd: (0, utils_1.winPath)((0, path_1.join)(absSrcPath, localeFolder)),
+        cwd: (0, plugin_utils_1.winPath)((0, path_1.join)(absSrcPath, localeFolder)),
     })
-        .map((name) => (0, utils_1.winPath)((0, path_1.join)(absSrcPath, localeFolder, name)))
-        .concat(utils_1.glob
+        .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, utils_1.winPath)((0, path_1.join)(absPagesPath, name))))
+        .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;
@@ -79,12 +70,12 @@ const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
             path: fullName,
         };
     });
-    const groups = utils_1.lodash.groupBy(localeFiles, 'name');
-    const promises = Object.keys(groups).map((name) => __awaiter(void 0, void 0, void 0, function* () {
+    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 = utils_1.lodash
-            .uniq(yield addAntdLocales({ lang, country }))
+        const antdLocale = plugin_utils_1.lodash
+            .uniq(await addAntdLocales({ lang, country }))
             .filter((localePath) => modulesHasLocale(localePath));
         return {
             lang,
@@ -94,15 +85,15 @@ const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
             locale: name.split(separator).join('-'),
             country,
             antdLocale,
-            paths: groups[name].map((item) => (0, utils_1.winPath)(item.path)),
+            paths: groups[name].map((item) => (0, plugin_utils_1.winPath)(item.path)),
             momentLocale,
         };
-    }));
+    });
     return Promise.all(promises);
-});
+};
 exports.getLocaleList = getLocaleList;
 const exactLocalePaths = (data) => {
-    return utils_1.lodash.flatten(data.map((item) => item.paths));
+    return plugin_utils_1.lodash.flatten(data.map((item) => item.paths));
 };
 exports.exactLocalePaths = exactLocalePaths;
 function isNeedPolyfill(targets = {}) {

package/dist/utils/modelUtils.d.ts

@@ -12,7 +12,9 @@ export declare class Model {
     namespace: string;
     id: string;
     exportName: string;
-    constructor(file: string, id: number);
+    deps: string[];
+    constructor(file: string, sort: {} | undefined, id: number);
+    findDeps(sort: object): string[];
 }
 export declare class ModelUtils {
     api: IApi;
@@ -20,8 +22,10 @@ export declare class ModelUtils {
     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;