2
0
mirror of https://github.com/tenrok/axios.git synced 2026-06-23 20:40:40 +03:00

Fixed issues created when merging 0.26.1

This commit is contained in:
Jay
2022-03-19 14:36:42 +02:00
parent 1a2ff9c3d1
commit ac659112db
10 changed files with 1876 additions and 170 deletions
+5
View File
@@ -1,5 +1,10 @@
# Changelog # Changelog
### 0.26.1 (March 9, 2022)
Fixes and Functionality:
- Refactored project file structure to avoid circular imports ([#4220](https://github.com/axios/axios/pull/4220))
### 0.26.0 (February 13, 2022) ### 0.26.0 (February 13, 2022)
Fixes and Functionality: Fixes and Functionality:
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "axios", "name": "axios",
"main": "./dist/axios.js", "main": "./dist/axios.js",
"version": "0.26.0", "version": "0.26.1",
"homepage": "https://axios-http.com", "homepage": "https://axios-http.com",
"authors": [ "authors": [
"Matt Zabriskie" "Matt Zabriskie"
+1861 -160
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -11,7 +11,7 @@ var httpsFollow = require('follow-redirects').https;
var url = require('url'); var url = require('url');
var zlib = require('zlib'); var zlib = require('zlib');
var VERSION = require('./../env/data').version; var VERSION = require('./../env/data').version;
var defaults = require('../defaults'); var transitionalDefaults = require('../defaults/transitional');
var AxiosError = require('../core/AxiosError'); var AxiosError = require('../core/AxiosError');
var CanceledError = require('../cancel/CanceledError'); var CanceledError = require('../cancel/CanceledError');
@@ -380,7 +380,7 @@ module.exports = function httpAdapter(config) {
// ClientRequest.setTimeout will be fired on the specify milliseconds, and can make sure that abort() will be fired after connect. // ClientRequest.setTimeout will be fired on the specify milliseconds, and can make sure that abort() will be fired after connect.
req.setTimeout(timeout, function handleRequestTimeout() { req.setTimeout(timeout, function handleRequestTimeout() {
req.abort(); req.abort();
var transitional = config.transitional || defaults.transitional; var transitional = config.transitional || transitionalDefaults;
reject(new AxiosError( reject(new AxiosError(
'timeout of ' + timeout + 'ms exceeded', 'timeout of ' + timeout + 'ms exceeded',
transitional.clarifyTimeoutError ? AxiosError.ETIMEDOUT : AxiosError.ECONNABORTED, transitional.clarifyTimeoutError ? AxiosError.ETIMEDOUT : AxiosError.ECONNABORTED,
+1 -1
View File
@@ -1,3 +1,3 @@
module.exports = { module.exports = {
"version": "0.26.0" "version": "0.26.1"
}; };
+2 -2
View File
@@ -1,11 +1,11 @@
{ {
"name": "axios", "name": "axios",
"version": "0.26.0", "version": "0.26.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "0.26.0", "version": "0.26.1",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"follow-redirects": "^1.14.8" "follow-redirects": "^1.14.8"
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "axios", "name": "axios",
"version": "0.26.0", "version": "0.26.1",
"description": "Promise based HTTP client for the browser and node.js", "description": "Promise based HTTP client for the browser and node.js",
"main": "index.js", "main": "index.js",
"types": "index.d.ts", "types": "index.d.ts",