@uni-helper/axios-adapter 1.18.1 → 1.20.0

package/README.md

@@ -51,7 +51,7 @@
 pnpm i @uni-helper/axios-adapter axios
 ```
 
-适配器与 axios 的版本需要保持主版本号和次版本号一致。当前适配器版本为 `1.18.0`，推荐搭配 `axios@^1.18.0` 使用。
+适配器与 axios 的版本需要保持主版本号和次版本号一致。当前适配器版本为 `1.20.0`，推荐搭配 `axios@^1.20.0` 使用。
 
 ## 快速开始
 
@@ -136,14 +136,16 @@ export default {
 - `options`：可选配置对象，当前版本支持扩展 uni-app 请求参数（参见 `globalExtensions.ts` 中的类型定义）。
 - 返回值：标准的 `AxiosAdapter` 函数。
 
-### `axios.upload<T>(url: string, data?: any, config?: AxiosRequestConfig): Promise<AxiosResponse<T>>`
+### `axios.upload<T = any, D = any, P = any>(url: string, data?: D, config?: AxiosRequestConfig<D, P>): Promise<AxiosResponse<T, D, {}, P>>`
 
 以 `uni.uploadFile` 发送上传请求，`data` 通常为 `FormData` 实例。
 
-### `axios.download<T>(url: string, config?: AxiosRequestConfig): Promise<AxiosResponse<T>>`
+### `axios.download<T = any, D = any, P = any>(url: string, config?: AxiosRequestConfig<D, P>): Promise<AxiosResponse<T, D, {}, P>>`
 
 以 `uni.downloadFile` 发起下载请求，返回的 `response.data` 默认为文件临时路径或 `Buffer`（取决于运行环境）。
 
+泛型已与 axios 自带方法对齐：`T` 为响应数据类型，`D`/`P` 分别对应请求数据与 `params`。旧版的第二个泛型参数 `R`（自定义返回类型）已移除——axios 1.19 起其默认值 `AxiosResponseDefault` 未导出，无法继续透传 `R`。
+
 ## 版本策略
 
 自 1.4.0 开始，请始终保持主版本号和次版本号与 axios 一致。例如当你安装了 1.5.1 版本时，你可以安装 axios 的 1.5.x 版本。这样做的目的是确保适配器始终支持最新的 axios 特性。

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_rolldown_runtime = require("./rolldown-runtime-D6vf50IK.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-VH7oDXx4.cjs");
 let axios = require("axios");
 let axios_unsafe_core_buildFullPath = require("axios/unsafe/core/buildFullPath");
 axios_unsafe_core_buildFullPath = require_rolldown_runtime.__toESM(axios_unsafe_core_buildFullPath, 1);
@@ -163,14 +163,15 @@ const download = (config, options) => {
 			...requestOptions,
 			success(result) {
 				if (!task) return;
-				(0, axios_unsafe_core_settle.default)(resolve, reject, {
+				const response = {
 					config: responseConfig,
 					data: result.tempFilePath,
 					headers: {},
 					status: result.statusCode,
 					statusText: result.errMsg ?? "OK",
 					request: task
-				});
+				};
+				(0, axios_unsafe_core_settle.default)(resolve, reject, response);
 				task = null;
 			},
 			fail(error) {
@@ -209,7 +210,7 @@ const request = (config, options) => {
 					result.header = dingHeader;
 				}
 				const headers = new axios.AxiosHeaders(result.header);
-				(0, axios_unsafe_core_settle.default)(resolve, reject, {
+				const response = {
 					config: responseConfig,
 					data: result.data,
 					headers,
@@ -217,7 +218,8 @@ const request = (config, options) => {
 					statusText: result.errMsg ?? "OK",
 					request: task,
 					cookies: result.cookies
-				});
+				};
+				(0, axios_unsafe_core_settle.default)(resolve, reject, response);
 				task = null;
 			},
 			fail(error) {
@@ -260,14 +262,15 @@ const upload = (config, options) => {
 			...requestOptions,
 			success(result) {
 				if (!task) return;
-				(0, axios_unsafe_core_settle.default)(resolve, reject, {
+				const response = {
 					config: responseConfig,
 					data: result.data,
 					headers: {},
 					status: result.statusCode,
 					statusText: result.errMsg ?? "OK",
 					request: task
-				});
+				};
+				(0, axios_unsafe_core_settle.default)(resolve, reject, response);
 				task = null;
 			},
 			fail(error) {

package/dist/index.d.cts

@@ -1,5 +1,4 @@
 import { AxiosAdapter } from "axios";
-
 //#region src/types.d.ts
 interface Options {}
 interface UserOptions extends Partial<Options> {}
@@ -11,8 +10,8 @@ declare module 'axios' {
     cookies?: string[];
   }
   interface Axios {
-    upload: <T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>) => Promise<R>;
-    download: <T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>) => Promise<R>;
+    upload: <T = any, D = any, P = any>(url: string, data?: D, config?: AxiosRequestConfig<D, P>) => AxiosPromise<T, D, P>;
+    download: <T = any, D = any, P = any>(url: string, config?: AxiosRequestConfig<D, P>) => AxiosPromise<T, D, P>;
   }
 }
 //#endregion

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { AxiosAdapter } from "axios";
-
 //#region src/types.d.ts
 interface Options {}
 interface UserOptions extends Partial<Options> {}
@@ -11,8 +10,8 @@ declare module 'axios' {
     cookies?: string[];
   }
   interface Axios {
-    upload: <T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>) => Promise<R>;
-    download: <T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>) => Promise<R>;
+    upload: <T = any, D = any, P = any>(url: string, data?: D, config?: AxiosRequestConfig<D, P>) => AxiosPromise<T, D, P>;
+    download: <T = any, D = any, P = any>(url: string, config?: AxiosRequestConfig<D, P>) => AxiosPromise<T, D, P>;
   }
 }
 //#endregion

package/dist/index.js

@@ -157,14 +157,15 @@ const download = (config, options) => {
 			...requestOptions,
 			success(result) {
 				if (!task) return;
-				settle(resolve, reject, {
+				const response = {
 					config: responseConfig,
 					data: result.tempFilePath,
 					headers: {},
 					status: result.statusCode,
 					statusText: result.errMsg ?? "OK",
 					request: task
-				});
+				};
+				settle(resolve, reject, response);
 				task = null;
 			},
 			fail(error) {
@@ -203,7 +204,7 @@ const request = (config, options) => {
 					result.header = dingHeader;
 				}
 				const headers = new AxiosHeaders(result.header);
-				settle(resolve, reject, {
+				const response = {
 					config: responseConfig,
 					data: result.data,
 					headers,
@@ -211,7 +212,8 @@ const request = (config, options) => {
 					statusText: result.errMsg ?? "OK",
 					request: task,
 					cookies: result.cookies
-				});
+				};
+				settle(resolve, reject, response);
 				task = null;
 			},
 			fail(error) {
@@ -254,14 +256,15 @@ const upload = (config, options) => {
 			...requestOptions,
 			success(result) {
 				if (!task) return;
-				settle(resolve, reject, {
+				const response = {
 					config: responseConfig,
 					data: result.data,
 					headers: {},
 					status: result.statusCode,
 					statusText: result.errMsg ?? "OK",
 					request: task
-				});
+				};
+				settle(resolve, reject, response);
 				task = null;
 			},
 			fail(error) {

package/dist/{rolldown-runtime-D6vf50IK.cjs → rolldown-runtime-VH7oDXx4.cjs}

@@ -15,7 +15,7 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));

package/dist/{unplugin-CbkCxx2I.cjs → unplugin-DATd423M.cjs}

@@ -1,4 +1,4 @@
-const require_rolldown_runtime = require("./rolldown-runtime-D6vf50IK.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-VH7oDXx4.cjs");
 let node_process = require("node:process");
 node_process = require_rolldown_runtime.__toESM(node_process, 1);
 let local_pkg = require("local-pkg");

package/dist/vite.cjs

@@ -1,4 +1,4 @@
 //#region src/vite.ts
-var vite_default = require("./unplugin-CbkCxx2I.cjs").unplugin.vite;
+var vite_default = require("./unplugin-DATd423M.cjs").unplugin.vite;
 //#endregion
 module.exports = vite_default;

package/dist/webpack.cjs

@@ -1,4 +1,4 @@
 //#region src/webpack.ts
-var webpack_default = require("./unplugin-CbkCxx2I.cjs").unplugin.webpack;
+var webpack_default = require("./unplugin-DATd423M.cjs").unplugin.webpack;
 //#endregion
 module.exports = webpack_default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@uni-helper/axios-adapter",
   "type": "module",
-  "version": "1.18.1",
+  "version": "1.20.0",
   "description": "The Axios adapter for uniapp",
   "author": {
     "name": "kejunmao",
@@ -60,7 +60,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "axios": "^1.18.0",
+    "axios": "^1.20.0",
     "vite": "^5.0.0"
   },
   "dependencies": {
@@ -68,17 +68,17 @@
     "unplugin": "^2.3.11"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^9.0.0",
-    "@dcloudio/types": "^3.4.31",
-    "@types/node": "^24.13.2",
-    "axios": "^1.18.1",
-    "bumpp": "^11.1.0",
-    "eslint": "^10.5.0",
-    "msw": "^2.14.6",
-    "tsdown": "^0.22.3",
+    "@antfu/eslint-config": "^9.3.0",
+    "@dcloudio/types": "^3.4.32",
+    "@types/node": "^24.13.3",
+    "axios": "^1.20.0",
+    "bumpp": "^12.2.2",
+    "eslint": "^10.9.1",
+    "msw": "^2.15.0",
+    "tsdown": "^0.22.14",
     "typescript": "^6.0.3",
     "vite": "^5.4.21",
-    "vitest": "^3.2.6"
+    "vitest": "^3.2.7"
   },
   "scripts": {
     "build": "tsdown",