@umijs/plugins 4.0.5 → 4.0.8

package/dist/qiankun/slave.js

@@ -1,119 +1,140 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const assert_1 = __importDefault(require("assert"));
-const fs_1 = require("fs");
-const path_1 = require("path");
-const plugin_utils_1 = require("umi/plugin-utils");
-const withTmpPath_1 = require("../utils/withTmpPath");
-const constants_1 = require("./constants");
-// BREAK CHANGE: 需要手动配置 slave: {}，不能留空
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// slave.ts
+var slave_exports = {};
+__export(slave_exports, {
+  default: () => slave_default
+});
+module.exports = __toCommonJS(slave_exports);
+var import_assert = __toESM(require("assert"));
+var import_fs = require("fs");
+var import_path = require("path");
+var import_plugin_utils = require("umi/plugin-utils");
+var import_withTmpPath = require("../utils/withTmpPath");
+var import_constants = require("./constants");
 function isSlaveEnable(opts) {
-    var _a, _b;
-    const slaveCfg = (_b = (_a = opts.userConfig) === null || _a === void 0 ? void 0 : _a.qiankun) === null || _b === void 0 ? void 0 : _b.slave;
-    if (slaveCfg) {
-        return slaveCfg.enable !== false;
-    }
-    return !!process.env.INITIAL_QIANKUN_SLAVE_OPTIONS;
+  var _a, _b;
+  const slaveCfg = (_b = (_a = opts.userConfig) == null ? void 0 : _a.qiankun) == null ? void 0 : _b.slave;
+  if (slaveCfg) {
+    return slaveCfg.enable !== false;
+  }
+  return !!process.env.INITIAL_QIANKUN_SLAVE_OPTIONS;
 }
-exports.default = (api) => {
-    api.describe({
-        key: 'qiankun-slave',
-        enableBy: isSlaveEnable,
-    });
-    api.addRuntimePlugin(() => {
-        return [(0, withTmpPath_1.withTmpPath)({ api, path: 'slaveRuntimePlugin.ts' })];
-    });
-    api.register({
-        key: 'addExtraModels',
-        fn() {
-            return [
-                (0, withTmpPath_1.withTmpPath)({
-                    api,
-                    path: `qiankunModel.ts#{"namespace":"${constants_1.qiankunStateFromMasterModelNamespace}"}`,
-                }),
-            ];
-        },
-    });
-    api.modifyDefaultConfig((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,
-            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;
-        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}`;
-        }
-        return modifiedDefaultConfig;
-    });
-    api.modifyConfig((config) => {
-        var _a, _b;
-        // mfsu 场景默认给子应用增加 mfName 配置，从而避免冲突
-        if (config.mfsu !== false) {
-            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.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;
-        config.output
-            .libraryTarget('umd')
-            .library(shouldNotAddLibraryChunkName ? api.pkg.name : `${api.pkg.name}-[name]`);
-        // TODO: SOCKET_SERVER
-        // TODO: devSourceMap
-        return config;
-    });
-    // umi bundle 添加 entry 标记
-    api.modifyHTML(($) => {
-        $('script').each((_, el) => {
-            var _a;
-            const scriptEl = $(el);
-            const umiEntry = /\/?umi(\.\w+)?\.js$/g;
-            if (umiEntry.test((_a = scriptEl.attr('src')) !== null && _a !== void 0 ? _a : '')) {
-                scriptEl.attr('entry', '');
-            }
-        });
-        return $;
+var slave_default = (api) => {
+  api.describe({
+    key: "qiankun-slave",
+    enableBy: isSlaveEnable
+  });
+  api.addRuntimePlugin(() => {
+    return [(0, import_withTmpPath.withTmpPath)({ api, path: "slaveRuntimePlugin.ts" })];
+  });
+  api.register({
+    key: "addExtraModels",
+    fn() {
+      return [
+        (0, import_withTmpPath.withTmpPath)({
+          api,
+          path: `qiankunModel.ts#{"namespace":"${import_constants.qiankunStateFromMasterModelNamespace}"}`
+        })
+      ];
+    }
+  });
+  api.modifyDefaultConfig((memo) => {
+    var _a, _b, _c;
+    const initialSlaveOptions = __spreadValues(__spreadValues({
+      devSourceMap: true
+    }, JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || "{}")), (memo.qiankun || {}).slave);
+    const modifiedDefaultConfig = __spreadProps(__spreadValues({}, memo), {
+      runtimePublicPath: true,
+      qiankun: __spreadProps(__spreadValues({}, memo.qiankun), {
+        slave: initialSlaveOptions
+      })
     });
-    api.addEntryImports(() => {
-        return [
-            {
-                source: '@@/plugin-qiankun-slave/lifecycles',
-                specifier: '{ genMount as qiankun_genMount, genBootstrap as qiankun_genBootstrap, genUnmount as qiankun_genUnmount, genUpdate as qiankun_genUpdate }',
-            },
-        ];
+    const shouldNotModifyDefaultBase = ((_b = (_a = api.userConfig.qiankun) == null ? void 0 : _a.slave) == null ? void 0 : _b.shouldNotModifyDefaultBase) ?? initialSlaveOptions.shouldNotModifyDefaultBase;
+    const historyType = ((_c = api.userConfig.history) == null ? void 0 : _c.type) || "browser";
+    if (!shouldNotModifyDefaultBase && historyType !== "hash") {
+      modifiedDefaultConfig.base = `/${api.pkg.name}`;
+    }
+    return modifiedDefaultConfig;
+  });
+  api.modifyConfig((config) => {
+    var _a, _b;
+    if (config.mfsu !== false) {
+      config.mfsu = __spreadProps(__spreadValues({}, config.mfsu), {
+        mfName: ((_a = config.mfsu) == null ? void 0 : _a.mfName) || `mf_${(_b = api.pkg.name) == null ? void 0 : _b.replace(/^@/, "").replace(/\W/g, "_")}`
+      });
+    }
+    return config;
+  });
+  api.addHTMLHeadScripts(() => {
+    var _a, _b;
+    const dontModify = (_b = (_a = api.config.qiankun) == null ? void 0 : _a.slave) == null ? void 0 : _b.shouldNotModifyRuntimePublicPath;
+    return dontModify ? [] : [
+      `window.publicPath = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || "${api.config.publicPath || "/"}";`
+    ];
+  });
+  api.chainWebpack((config) => {
+    (0, import_assert.default)(api.pkg.name, "You should have name in package.json.");
+    const { shouldNotAddLibraryChunkName } = (api.config.qiankun || {}).slave;
+    config.output.libraryTarget("umd").library(shouldNotAddLibraryChunkName ? api.pkg.name : `${api.pkg.name}-[name]`);
+    return config;
+  });
+  api.modifyHTML(($) => {
+    $("script").each((_, el) => {
+      const scriptEl = $(el);
+      const umiEntry = /\/?umi(\.\w+)?\.js$/g;
+      if (umiEntry.test(scriptEl.attr("src") ?? "")) {
+        scriptEl.attr("entry", "");
+      }
     });
-    api.addEntryCode(() => [
-        `
+    return $;
+  });
+  api.addEntryImports(() => {
+    return [
+      {
+        source: "@@/plugin-qiankun-slave/lifecycles",
+        specifier: "{ genMount as qiankun_genMount, genBootstrap as qiankun_genBootstrap, genUnmount as qiankun_genUnmount, genUpdate as qiankun_genUpdate }"
+      }
+    ];
+  });
+  api.addEntryCode(() => [
+    `
 export const bootstrap = qiankun_genBootstrap(render);
 export const mount = qiankun_genMount('${api.config.mountElementId}');
 export const unmount = qiankun_genUnmount('${api.config.mountElementId}');
@@ -121,44 +142,33 @@ export const update = qiankun_genUpdate();
 if (!window.__POWERED_BY_QIANKUN__) {
   bootstrap().then(mount);
 }
-    `,
-    ]);
-    function getFileContent(file) {
-        return (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../libs/qiankun/slave', file), 'utf-8');
-    }
-    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: 'index.ts',
-                content: `
+    `
+  ]);
+  function getFileContent(file) {
+    return (0, import_fs.readFileSync)((0, import_path.join)(__dirname, "../../libs/qiankun/slave", file), "utf-8");
+  }
+  api.onGenerateFiles({
+    fn() {
+      [
+        "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, import_plugin_utils.winPath)((0, import_path.dirname)(require.resolve("qiankun/package")))}'`).replace(/from 'lodash\//g, `from '${(0, import_plugin_utils.winPath)((0, import_path.dirname)(require.resolve("lodash/package")))}/`)
+        });
+      });
+      api.writeTmpFile({
+        path: "index.ts",
+        content: `
 export { connectMaster } from './connectMaster';
-      `,
-            });
-        },
-        before: 'model',
-    });
+      `
+      });
+    },
+    before: "model"
+  });
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/qiankun.js

@@ -1,20 +1,47 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (api) => {
-    api.describe({
-        config: {
-            schema(joi) {
-                return joi.object().keys({
-                    slave: joi.object(),
-                    master: joi.object(),
-                    externalQiankun: joi.boolean(),
-                });
-            },
-        },
-    });
-    api.addRuntimePluginKey(() => ['qiankun']);
-    api.registerPlugins([
-        require.resolve('./qiankun/master'),
-        require.resolve('./qiankun/slave'),
-    ]);
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// qiankun.ts
+var qiankun_exports = {};
+__export(qiankun_exports, {
+  default: () => qiankun_default
+});
+module.exports = __toCommonJS(qiankun_exports);
+var qiankun_default = (api) => {
+  api.describe({
+    config: {
+      schema(joi) {
+        return joi.object().keys({
+          slave: joi.object(),
+          master: joi.object(),
+          externalQiankun: joi.boolean()
+        });
+      }
+    }
+  });
+  api.addRuntimePluginKey(() => ["qiankun"]);
+  api.registerPlugins([
+    require.resolve("./qiankun/master"),
+    require.resolve("./qiankun/slave")
+  ]);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/request.js

@@ -1,28 +1,51 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = require("path");
-const plugin_utils_1 = require("umi/plugin-utils");
-exports.default = (api) => {
-    api.describe({
-        key: 'request',
-        config: {
-            schema: (joi) => {
-                return joi.object({
-                    dataField: joi
-                        .string()
-                        .pattern(/^[a-zA-Z]*$/)
-                        .allow(''),
-                });
-            },
-        },
-        enableBy: api.EnableBy.config,
-    });
-    api.addRuntimePluginKey(() => ['request']);
-    const requestTpl = `
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// request.ts
+var request_exports = {};
+__export(request_exports, {
+  default: () => request_default
+});
+module.exports = __toCommonJS(request_exports);
+var import_path = require("path");
+var import_plugin_utils = require("umi/plugin-utils");
+var request_default = (api) => {
+  api.describe({
+    key: "request",
+    config: {
+      schema: (joi) => {
+        return joi.object({
+          dataField: joi.string().pattern(/^[a-zA-Z]*$/).allow("")
+        });
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
+  api.addRuntimePluginKey(() => ["request"]);
+  const requestTpl = `
 import axios, {
   type AxiosInstance,
   type AxiosRequestConfig,
   type AxiosResponse,
+  type AxiosError,
 } from '{{{axiosPath}}}';
 import useUmiRequest, { UseRequestProvider } from '{{{umiRequestPath}}}';
 import { ApplyPluginsType } from 'umi';
@@ -100,7 +123,7 @@ function useRequest(service: any, options: any = {}) {
   });
 }
 
-// request 方法 opts 参数的接口
+// request \u65B9\u6CD5 opts \u53C2\u6570\u7684\u63A5\u53E3
 interface IRequestOptions extends AxiosRequestConfig {
   skipErrorHandler?: boolean;
   requestInterceptors?: IRequestInterceptorTuple[];
@@ -119,10 +142,12 @@ interface IRequestOptionsWithoutResponse extends IRequestOptions{
 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
+   <T = any>(url: string, opts: IRequestOptions): Promise<T>; // getResponse \u9ED8\u8BA4\u662F false\uFF0C \u56E0\u6B64\u4E0D\u63D0\u4F9B\u8BE5\u53C2\u6570\u65F6\uFF0C\u53EA\u8FD4\u56DE data
+   <T = any>(url: string): Promise<T>;  // \u4E0D\u63D0\u4F9B opts \u65F6\uFF0C\u9ED8\u8BA4\u4F7F\u7528 'GET' method\uFF0C\u5E76\u4E14\u9ED8\u8BA4\u8FD4\u56DE data
 }
 
+type RequestError = AxiosError | Error
+
 interface IErrorHandler {
   (error: RequestError, opts: IRequestOptions): void;
 }
@@ -134,10 +159,10 @@ type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => AxiosRespo
 type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [ IRequestInterceptor ] | IRequestInterceptor
 type IResponseInterceptorTuple = [IResponseInterceptor, IErrorInterceptor] | [IResponseInterceptor] | IResponseInterceptor
 
-export interface RequestConfig extends AxiosRequestConfig {
+export interface RequestConfig<T = any> extends AxiosRequestConfig {
   errorConfig?: {
     errorHandler?: IErrorHandler;
-    errorThrower?: <T = any>( res: T ) => void
+    errorThrower?: ( res: T ) => void
   };
   requestInterceptors?: IRequestInterceptorTuple[];
   responseInterceptors?: IResponseInterceptorTuple[];
@@ -188,7 +213,7 @@ const getRequestInstance = (): AxiosInstance => {
        requestInstance.interceptors.response.use(interceptor);
   });
 
-  // 当响应的数据 success 是 false 的时候，抛出 error 以供 errorHandler 处理。
+  // \u5F53\u54CD\u5E94\u7684\u6570\u636E success \u662F false \u7684\u65F6\u5019\uFF0C\u629B\u51FA error \u4EE5\u4F9B errorHandler \u5904\u7406\u3002
   requestInstance.interceptors.response.use((response) => {
     const { data } = response;
     if(data?.success === false && config?.errorConfig?.errorThrower){
@@ -272,48 +297,54 @@ export type {
   AxiosInstance,
   AxiosRequestConfig,
   AxiosResponse,
+  AxiosError,
+  RequestError,
   IResponseInterceptor as ResponseInterceptor,
   IRequestOptions as RequestOptions,
   IRequest as Request,
 };
 
 `;
-    api.onGenerateFiles(() => {
-        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')));
-        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,
-                formatResult,
-            }),
-        });
-        api.writeTmpFile({
-            path: 'types.d.ts',
-            content: `
+  api.onGenerateFiles(() => {
+    var _a;
+    const umiRequestPath = (0, import_plugin_utils.winPath)((0, import_path.dirname)(require.resolve("@ahooksjs/use-request/package.json")));
+    const axiosPath = (0, import_plugin_utils.winPath)((0, import_path.dirname)(require.resolve("axios/package.json")));
+    let dataField = (_a = api.config.request) == null ? void 0 : _a.dataField;
+    if (dataField === void 0)
+      dataField = "data";
+    const formatResult = dataField === "" ? `result => result` : `result => result?.${dataField}`;
+    api.writeTmpFile({
+      path: "request.ts",
+      content: import_plugin_utils.Mustache.render(requestTpl, {
+        umiRequestPath,
+        axiosPath,
+        formatResult
+      })
+    });
+    api.writeTmpFile({
+      path: "types.d.ts",
+      content: `
 export type { 
   RequestConfig,  
   AxiosInstance,
   AxiosRequestConfig,
   AxiosResponse, 
+  AxiosError,
+  RequestError,
   ResponseInterceptor } from './request';
-`,
-        });
-        api.writeTmpFile({
-            path: 'index.ts',
-            content: `
+`
+    });
+    api.writeTmpFile({
+      path: "index.ts",
+      content: `
 export {
   useRequest,
   UseRequestProvider,
   request,
 } from './request';
-`,
-        });
+`
     });
+  });
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});