From 31d717aaa119eebf5f16c5c6318564455081289f Mon Sep 17 00:00:00 2001 From: Jay Date: Wed, 9 Mar 2022 18:02:10 +0200 Subject: [PATCH] Feat/circular deps (#4515) * Refactored project file structure to avoid circular imports; * Bump url-parse from 1.5.4 to 1.5.10 (#4501) Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.4 to 1.5.10. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.5.4...1.5.10) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: DigitalBrainJS Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- lib/adapters/http.js | 4 ++-- lib/adapters/xhr.js | 4 ++-- lib/core/transformData.js | 2 +- lib/{defaults.js => defaults/index.js} | 17 +++++++---------- lib/defaults/transitional.js | 7 +++++++ package-lock.json | 12 ++++++------ test/specs/defaults.spec.js | 2 +- 7 files changed, 26 insertions(+), 22 deletions(-) rename lib/{defaults.js => defaults/index.js} (90%) create mode 100644 lib/defaults/transitional.js diff --git a/lib/adapters/http.js b/lib/adapters/http.js index 951e400fa6..28317c1055 100755 --- a/lib/adapters/http.js +++ b/lib/adapters/http.js @@ -13,7 +13,7 @@ var zlib = require('zlib'); var VERSION = require('./../env/data').version; var createError = require('../core/createError'); var enhanceError = require('../core/enhanceError'); -var defaults = require('../defaults'); +var transitionalDefaults = require('../defaults/transitional'); var Cancel = require('../cancel/Cancel'); var isHttps = /https:?/; @@ -365,7 +365,7 @@ module.exports = function httpAdapter(config) { } else { timeoutErrorMessage = 'timeout of ' + config.timeout + 'ms exceeded'; } - var transitional = config.transitional || defaults.transitional; + var transitional = config.transitional || transitionalDefaults; reject(createError( timeoutErrorMessage, config, diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js index 77246f8cb5..e58625aaa0 100644 --- a/lib/adapters/xhr.js +++ b/lib/adapters/xhr.js @@ -8,7 +8,7 @@ var buildFullPath = require('../core/buildFullPath'); var parseHeaders = require('./../helpers/parseHeaders'); var isURLSameOrigin = require('./../helpers/isURLSameOrigin'); var createError = require('../core/createError'); -var defaults = require('../defaults'); +var transitionalDefaults = require('../defaults/transitional'); var Cancel = require('../cancel/Cancel'); module.exports = function xhrAdapter(config) { @@ -123,7 +123,7 @@ module.exports = function xhrAdapter(config) { // Handle timeout request.ontimeout = function handleTimeout() { var timeoutErrorMessage = config.timeout ? 'timeout of ' + config.timeout + 'ms exceeded' : 'timeout exceeded'; - var transitional = config.transitional || defaults.transitional; + var transitional = config.transitional || transitionalDefaults; if (config.timeoutErrorMessage) { timeoutErrorMessage = config.timeoutErrorMessage; } diff --git a/lib/core/transformData.js b/lib/core/transformData.js index c584d12bc2..82ee7dd7af 100644 --- a/lib/core/transformData.js +++ b/lib/core/transformData.js @@ -1,7 +1,7 @@ 'use strict'; var utils = require('./../utils'); -var defaults = require('./../defaults'); +var defaults = require('../defaults'); /** * Transform the data for a request or a response diff --git a/lib/defaults.js b/lib/defaults/index.js similarity index 90% rename from lib/defaults.js rename to lib/defaults/index.js index eaee1898a0..8b57b88240 100644 --- a/lib/defaults.js +++ b/lib/defaults/index.js @@ -1,8 +1,9 @@ 'use strict'; -var utils = require('./utils'); -var normalizeHeaderName = require('./helpers/normalizeHeaderName'); -var enhanceError = require('./core/enhanceError'); +var utils = require('../utils'); +var normalizeHeaderName = require('../helpers/normalizeHeaderName'); +var enhanceError = require('../core/enhanceError'); +var transitionalDefaults = require('./transitional'); var DEFAULT_CONTENT_TYPE = { 'Content-Type': 'application/x-www-form-urlencoded' @@ -18,10 +19,10 @@ function getDefaultAdapter() { var adapter; if (typeof XMLHttpRequest !== 'undefined') { // For browsers use XHR adapter - adapter = require('./adapters/xhr'); + adapter = require('../adapters/xhr'); } else if (typeof process !== 'undefined' && Object.prototype.toString.call(process) === '[object process]') { // For node use HTTP adapter - adapter = require('./adapters/http'); + adapter = require('../adapters/http'); } return adapter; } @@ -43,11 +44,7 @@ function stringifySafely(rawValue, parser, encoder) { var defaults = { - transitional: { - silentJSONParsing: true, - forcedJSONParsing: true, - clarifyTimeoutError: false - }, + transitional: transitionalDefaults, adapter: getDefaultAdapter(), diff --git a/lib/defaults/transitional.js b/lib/defaults/transitional.js new file mode 100644 index 0000000000..601dd7ef63 --- /dev/null +++ b/lib/defaults/transitional.js @@ -0,0 +1,7 @@ +'use strict'; + +module.exports = { + silentJSONParsing: true, + forcedJSONParsing: true, + clarifyTimeoutError: false +}; diff --git a/package-lock.json b/package-lock.json index a7391e812f..5cf8f40aa8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14187,9 +14187,9 @@ } }, "node_modules/url-parse": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz", - "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==", + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", "dev": true, "dependencies": { "querystringify": "^2.1.1", @@ -27760,9 +27760,9 @@ } }, "url-parse": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz", - "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==", + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", "dev": true, "requires": { "querystringify": "^2.1.1", diff --git a/test/specs/defaults.spec.js b/test/specs/defaults.spec.js index ff0f15febe..c158d45a85 100644 --- a/test/specs/defaults.spec.js +++ b/test/specs/defaults.spec.js @@ -31,7 +31,7 @@ describe('defaults', function () { expect(defaults.transformRequest[0](true, headers)).toEqual('true'); expect(defaults.transformRequest[0](false, headers)).toEqual('false'); expect(defaults.transformRequest[0](null, headers)).toEqual('null'); - }); + }); it('should do nothing to request string', function () { expect(defaults.transformRequest[0]('foo=bar')).toEqual('foo=bar');