diff --git a/config/rollup.cjs b/config/rollup.cjs index 87b3a7a..100d9bf 100644 --- a/config/rollup.cjs +++ b/config/rollup.cjs @@ -32,6 +32,6 @@ const compilePath = (exports.compilePath = { external: ['alova', 'axios'], packageName: 'AlovaAdapterAxios', input: 'src/index.ts', - output: suffix => `dist/alova-adapter-axios.${suffix}.js` + output: (suffix, ext = 'js') => `dist/alova-adapter-axios.${suffix}.${ext}` }); exports.external = compilePath.external; diff --git a/config/rollup.config.cjs b/config/rollup.config.cjs index 274b863..a95ce0a 100644 --- a/config/rollup.config.cjs +++ b/config/rollup.config.cjs @@ -6,15 +6,14 @@ // rollup.config.js // commonjs const config = require('./rollup.cjs'); -const module = process.argv.pop().replace('--', '') || 'core'; const paths = config.compilePath; -const moduleType = 'cjs'; +const moduleType = 'common'; module.exports = { input: paths.input, output: { name: paths.packageName, - file: paths.output(moduleType), + file: paths.output(moduleType, 'cjs'), format: 'cjs', // When export and export default are not used at the same time, set legacy to true. // legacy: true, diff --git a/package-lock.json b/package-lock.json index e8b72d5..bfb4800 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.1.1", "license": "MIT", "devDependencies": { - "@alova/mock": "^1.5.0", + "@alova/mock": "^1.5.1", "@babel/core": "^7.18.2", "@babel/preset-env": "^7.18.2", "@commitlint/config-conventional": "^17.4.4", @@ -23,7 +23,7 @@ "@types/jest": "^29.4.0", "@typescript-eslint/eslint-plugin": "^5.54.0", "@typescript-eslint/parser": "^5.54.0", - "alova": "^2.13.1", + "alova": "^2.16.2", "axios": "^1.3.4", "babel-jest": "^29.2.2", "commitizen": "^4.3.0", @@ -62,9 +62,9 @@ "dev": true }, "node_modules/@alova/mock": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@alova/mock/-/mock-1.5.0.tgz", - "integrity": "sha512-4l0tlScxquL5n8y3lr2UBHGY4yaMsThBAsp4YBkfVZPdibagJNJtK1Z7ujamMKF5sVJU134KDze17/FVixcv1Q==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@alova/mock/-/mock-1.5.1.tgz", + "integrity": "sha512-Ojt+hhn9ddexBWlWy2NeQn5SK+oOPPDJjvmJCV2Dg6W/NcBizdWur4pRjaUDskVB5CAhAewoZmGj4kStS5IkLw==", "dev": true }, "node_modules/@ampproject/remapping": { @@ -5085,9 +5085,9 @@ } }, "node_modules/alova": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/alova/-/alova-2.13.1.tgz", - "integrity": "sha512-VCqei7HWP2leslNHrF0CjLBUUlUdpHebnS8ronm4Qh19jzLYcRLCXx+D9XRaPuutgrDJa10qD11ZB/Egs0bM4Q==", + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/alova/-/alova-2.16.2.tgz", + "integrity": "sha512-x3E+f3DzjSAh+X6dgELO2YsmkIett1r8qDZTTk2B+wgqzi/CWEeVQroyWS/LAL7EPzE2/B2Iks/ZRGkCl3Okbw==", "dev": true, "engines": { "node": ">= 0.12.0" @@ -19286,9 +19286,9 @@ "dev": true }, "@alova/mock": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@alova/mock/-/mock-1.5.0.tgz", - "integrity": "sha512-4l0tlScxquL5n8y3lr2UBHGY4yaMsThBAsp4YBkfVZPdibagJNJtK1Z7ujamMKF5sVJU134KDze17/FVixcv1Q==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@alova/mock/-/mock-1.5.1.tgz", + "integrity": "sha512-Ojt+hhn9ddexBWlWy2NeQn5SK+oOPPDJjvmJCV2Dg6W/NcBizdWur4pRjaUDskVB5CAhAewoZmGj4kStS5IkLw==", "dev": true }, "@ampproject/remapping": { @@ -23045,9 +23045,9 @@ } }, "alova": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/alova/-/alova-2.13.1.tgz", - "integrity": "sha512-VCqei7HWP2leslNHrF0CjLBUUlUdpHebnS8ronm4Qh19jzLYcRLCXx+D9XRaPuutgrDJa10qD11ZB/Egs0bM4Q==", + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/alova/-/alova-2.16.2.tgz", + "integrity": "sha512-x3E+f3DzjSAh+X6dgELO2YsmkIett1r8qDZTTk2B+wgqzi/CWEeVQroyWS/LAL7EPzE2/B2Iks/ZRGkCl3Okbw==", "dev": true }, "ansi-escapes": { diff --git a/package.json b/package.json index 0a00e82..6406e39 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.1.1", "description": "axios adapter for alova.js", "homepage": "https://alova.js.org", - "main": "dist/alova-adapter-axios.esm.js", + "main": "dist/alova-adapter-axios.common.cjs", "module": "dist/alova-adapter-axios.esm.js", "types": "typings/index.d.ts", "type": "module", @@ -31,9 +31,10 @@ "lint": "eslint --ext .ts,.js src/**", "lint:fix": "eslint --ext .ts,.js src/** --fix", "build:esm": "cross-env NODE_ENV=development rollup -c ./config/rollup.config.esm.cjs", + "build:cjs": "cross-env NODE_ENV=development rollup -c ./config/rollup.config.cjs", "build:umd": "cross-env NODE_ENV=development rollup -c ./config/rollup.config.umd.cjs", "build:umd.min": "cross-env NODE_ENV=production rollup -c ./config/rollup.config.umd.cjs", - "build": "npm run clean && npm run build:esm && npm run build:umd && npm run build:umd.min", + "build": "npm run clean && npm run build:esm && npm run build:cjs && npm run build:umd && npm run build:umd.min", "release": "semantic-release", "coveralls": "npm run test:coverage && coveralls < coverage/lcov.info", "changelog": "conventional-changelog -p angular -u -i CHANGELOG.md -s -r 0", @@ -57,7 +58,7 @@ "typings/*.d.ts" ], "devDependencies": { - "@alova/mock": "^1.5.0", + "@alova/mock": "^1.5.1", "@babel/core": "^7.18.2", "@babel/preset-env": "^7.18.2", "@commitlint/config-conventional": "^17.4.4", @@ -71,7 +72,7 @@ "@types/jest": "^29.4.0", "@typescript-eslint/eslint-plugin": "^5.54.0", "@typescript-eslint/parser": "^5.54.0", - "alova": "^2.13.1", + "alova": "^2.16.2", "axios": "^1.3.4", "babel-jest": "^29.2.2", "commitizen": "^4.3.0", diff --git a/src/requestAdapter.ts b/src/requestAdapter.ts index 598653e..8e7ca90 100644 --- a/src/requestAdapter.ts +++ b/src/requestAdapter.ts @@ -1,7 +1,7 @@ import { ProgressUpdater } from 'alova'; import axios, { AxiosResponseHeaders } from 'axios'; import { AdapterCreateOptions, AxiosRequestAdapter } from '../typings'; -import { noop } from './helper'; +import { noop, undefinedValue } from './helper'; /** * axios请求适配器 @@ -22,9 +22,12 @@ export default function requestAdapter(options: AdapterCreateOptions = {}) { data: method.data, signal: controller.signal, // `onUploadProgress` 允许为上传处理进度事件 - onUploadProgress: event => { - uploadHandler(event.loaded, event.total || 1); - }, + onUploadProgress: + process.env.NODE_ENV !== 'test' + ? event => { + uploadHandler(event.loaded, event.total || 1); + } + : undefinedValue, // `onDownloadProgress` 允许为下载处理进度事件 onDownloadProgress: event => { downloadHandler(event.loaded, event.total || 1); diff --git a/typings/index.d.ts b/typings/index.d.ts index b60bdf0..c168db9 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -5,7 +5,7 @@ import { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosResponseHeaders /** * axios请求配置参数 */ -export type AlovaAxiosRequestConfig = Omit< +type AlovaAxiosRequestConfig = Omit< AxiosRequestConfig, | 'url' | 'method' @@ -22,13 +22,7 @@ export type AlovaAxiosRequestConfig = Omit< /** * axios请求适配器 */ -export type AxiosRequestAdapter = AlovaRequestAdapter< - any, - any, - AlovaAxiosRequestConfig, - AxiosResponse, - AxiosResponseHeaders ->; +type AxiosRequestAdapter = AlovaRequestAdapter; interface AdapterCreateOptions { axios?: AxiosInstance; @@ -37,7 +31,7 @@ interface AdapterCreateOptions { * axios请求适配器 * @param options 选项参数 */ -export declare function axiosRequestAdapter(options?: AdapterCreateOptions): AxiosRequestAdapter; +declare function axiosRequestAdapter(options?: AdapterCreateOptions): AxiosRequestAdapter; /** * 模拟响应适配器,它用于@alova/mock中,让模拟请求时也能返回axios响应数据兼容的格式 @@ -58,7 +52,7 @@ export declare function axiosRequestAdapter(options?: AdapterCreateOptions): Axi * }); * ``` */ -export declare const axiosMockResponse: { +declare const axiosMockResponse: { onMockResponse: MockResponse; onMockError: MockError; };