Fixed issues created when merging 0.26.1

CHANGELOG.md

@@ -1,5 +1,10 @@
 # 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)
 
 Fixes and Functionality:

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "axios",
   "main": "./dist/axios.js",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "homepage": "https://axios-http.com",
   "authors": [
     "Matt Zabriskie"

lib/adapters/http.js

@@ -11,7 +11,7 @@ var httpsFollow = require('follow-redirects').https;
 var url = require('url');
 var zlib = require('zlib');
 var VERSION = require('./../env/data').version;
-var defaults = require('../defaults');
+var transitionalDefaults = require('../defaults/transitional');
 var AxiosError = require('../core/AxiosError');
 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.
       req.setTimeout(timeout, function handleRequestTimeout() {
         req.abort();
-        var transitional = config.transitional || defaults.transitional;
+        var transitional = config.transitional || transitionalDefaults;
         reject(new AxiosError(
           'timeout of ' + timeout + 'ms exceeded',
           transitional.clarifyTimeoutError ? AxiosError.ETIMEDOUT : AxiosError.ECONNABORTED,

lib/env/data.js

@@ -1,3 +1,3 @@
 module.exports = {
-  "version": "0.26.0"
+  "version": "0.26.1"
 };

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "axios",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.26.0",
+      "version": "0.26.1",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.14.8"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "axios",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "description": "Promise based HTTP client for the browser and node.js",
   "main": "index.js",
   "types": "index.d.ts",