From b9a4419c234001adebfc7868f48870f4c88f3bcd Mon Sep 17 00:00:00 2001 From: Ivan Barsukov Date: Wed, 5 Oct 2022 22:45:49 +0200 Subject: [PATCH 1/2] fix: removing multiple/trailing/leading whitespaces --- README.md | 4 ++-- dist/esm/axios.js | 4 ++-- dist/node/axios.cjs | 4 ++-- examples/amd/index.html | 2 +- examples/post/server.js | 2 +- index.d.ts | 4 ++-- lib/adapters/xhr.js | 2 +- lib/helpers/speedometer.js | 2 +- test/specs/core/AxiosError.spec.js | 2 +- tslint.json | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 63a734f259..6ef7d37012 100755 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@

Website • Documentation -

+

@@ -26,7 +26,7 @@ ![npm bundle size](https://img.shields.io/bundlephobia/minzip/axios)
- + ## Table of Contents - [Features](#features) diff --git a/dist/esm/axios.js b/dist/esm/axios.js index 5baee80b96..e4715ba27d 100644 --- a/dist/esm/axios.js +++ b/dist/esm/axios.js @@ -1829,7 +1829,7 @@ function speedometer(samplesCount, min) { const passed = startedAt && now - startedAt; - return passed ? Math.round(bytesCount * 1000 / passed) : undefined; + return passed ? Math.round(bytesCount * 1000 / passed) : undefined; }; } @@ -1905,7 +1905,7 @@ function xhrAdapter(config) { const responseHeaders = AxiosHeaders.from( 'getAllResponseHeaders' in request && request.getAllResponseHeaders() ); - const responseData = !responseType || responseType === 'text' || responseType === 'json' ? + const responseData = !responseType || responseType === 'text' || responseType === 'json' ? request.responseText : request.response; const response = { data: responseData, diff --git a/dist/node/axios.cjs b/dist/node/axios.cjs index e3e50638c3..35bc2adcc6 100644 --- a/dist/node/axios.cjs +++ b/dist/node/axios.cjs @@ -1785,7 +1785,7 @@ function speedometer(samplesCount, min) { const passed = startedAt && now - startedAt; - return passed ? Math.round(bytesCount * 1000 / passed) : undefined; + return passed ? Math.round(bytesCount * 1000 / passed) : undefined; }; } @@ -2715,7 +2715,7 @@ function xhrAdapter(config) { const responseHeaders = AxiosHeaders.from( 'getAllResponseHeaders' in request && request.getAllResponseHeaders() ); - const responseData = !responseType || responseType === 'text' || responseType === 'json' ? + const responseData = !responseType || responseType === 'text' || responseType === 'json' ? request.responseText : request.response; const response = { data: responseData, diff --git a/examples/amd/index.html b/examples/amd/index.html index 1b10d2be8c..ce3800d869 100644 --- a/examples/amd/index.html +++ b/examples/amd/index.html @@ -6,7 +6,7 @@

AMD

- +

User

diff --git a/examples/post/server.js b/examples/post/server.js index 26e6d64043..1cb9c45fa6 100644 --- a/examples/post/server.js +++ b/examples/post/server.js @@ -1,6 +1,6 @@ export default function (req, res) { let data = ''; - + req.on('data', function (chunk) { data += chunk; }); diff --git a/index.d.ts b/index.d.ts index e79e20f56b..3deb0f6111 100644 --- a/index.d.ts +++ b/index.d.ts @@ -6,7 +6,7 @@ type MethodsHeaders = { [Key in Method as Lowercase]: AxiosHeaders; }; -interface CommonHeaders { +interface CommonHeaders { common: AxiosHeaders; } @@ -332,7 +332,7 @@ export interface CreateAxiosDefaults extends Omit headers?: RawAxiosRequestHeaders | Partial; } -export interface AxiosResponse { +export interface AxiosResponse { data: T; status: number; statusText: string; diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js index e0233f5e01..a41b2e611d 100644 --- a/lib/adapters/xhr.js +++ b/lib/adapters/xhr.js @@ -86,7 +86,7 @@ export default function xhrAdapter(config) { const responseHeaders = AxiosHeaders.from( 'getAllResponseHeaders' in request && request.getAllResponseHeaders() ); - const responseData = !responseType || responseType === 'text' || responseType === 'json' ? + const responseData = !responseType || responseType === 'text' || responseType === 'json' ? request.responseText : request.response; const response = { data: responseData, diff --git a/lib/helpers/speedometer.js b/lib/helpers/speedometer.js index 10782b7b87..3b3c6662f6 100644 --- a/lib/helpers/speedometer.js +++ b/lib/helpers/speedometer.js @@ -48,7 +48,7 @@ function speedometer(samplesCount, min) { const passed = startedAt && now - startedAt; - return passed ? Math.round(bytesCount * 1000 / passed) : undefined; + return passed ? Math.round(bytesCount * 1000 / passed) : undefined; }; } diff --git a/test/specs/core/AxiosError.spec.js b/test/specs/core/AxiosError.spec.js index 91687faf19..907ceada8a 100644 --- a/test/specs/core/AxiosError.spec.js +++ b/test/specs/core/AxiosError.spec.js @@ -35,7 +35,7 @@ describe('core::AxiosError', function() { const request = { path: '/foo' }; const response = { status: 200, data: { foo: 'bar' } }; - const axiosError = AxiosError.from(error, 'ESOMETHING', { foo: 'bar' }, request, response); + const axiosError = AxiosError.from(error, 'ESOMETHING', { foo: 'bar' }, request, response); expect(axiosError.config).toEqual({ foo: 'bar' }); expect(axiosError.code).toBe('ESOMETHING'); expect(axiosError.request).toBe(request); diff --git a/tslint.json b/tslint.json index 3ec44a760a..e078a19c21 100644 --- a/tslint.json +++ b/tslint.json @@ -1,4 +1,4 @@ -{ +{ "extends": "dtslint/dtslint.json", "rules": { "no-unnecessary-generics": false From b239657c658eccf3960ffbc611c0064750f97dfb Mon Sep 17 00:00:00 2001 From: Ivan Barsukov Date: Sun, 30 Oct 2022 22:43:56 +0100 Subject: [PATCH 2/2] Reverting changes in the dist directory --- dist/esm/axios.js | 4 ++-- dist/node/axios.cjs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/esm/axios.js b/dist/esm/axios.js index e4715ba27d..5baee80b96 100644 --- a/dist/esm/axios.js +++ b/dist/esm/axios.js @@ -1829,7 +1829,7 @@ function speedometer(samplesCount, min) { const passed = startedAt && now - startedAt; - return passed ? Math.round(bytesCount * 1000 / passed) : undefined; + return passed ? Math.round(bytesCount * 1000 / passed) : undefined; }; } @@ -1905,7 +1905,7 @@ function xhrAdapter(config) { const responseHeaders = AxiosHeaders.from( 'getAllResponseHeaders' in request && request.getAllResponseHeaders() ); - const responseData = !responseType || responseType === 'text' || responseType === 'json' ? + const responseData = !responseType || responseType === 'text' || responseType === 'json' ? request.responseText : request.response; const response = { data: responseData, diff --git a/dist/node/axios.cjs b/dist/node/axios.cjs index 35bc2adcc6..e3e50638c3 100644 --- a/dist/node/axios.cjs +++ b/dist/node/axios.cjs @@ -1785,7 +1785,7 @@ function speedometer(samplesCount, min) { const passed = startedAt && now - startedAt; - return passed ? Math.round(bytesCount * 1000 / passed) : undefined; + return passed ? Math.round(bytesCount * 1000 / passed) : undefined; }; } @@ -2715,7 +2715,7 @@ function xhrAdapter(config) { const responseHeaders = AxiosHeaders.from( 'getAllResponseHeaders' in request && request.getAllResponseHeaders() ); - const responseData = !responseType || responseType === 'text' || responseType === 'json' ? + const responseData = !responseType || responseType === 'text' || responseType === 'json' ? request.responseText : request.response; const response = { data: responseData,