From 203cbc2da0ef0f68d517ba2a6176df1d48efc2fb Mon Sep 17 00:00:00 2001 From: Matt Zabriskie Date: Wed, 1 Jun 2016 13:54:38 -0600 Subject: [PATCH] Moving settle & transformData from helpers/ -> core/ --- lib/adapters/README.md | 4 ++-- lib/adapters/http.js | 4 ++-- lib/adapters/xhr.js | 4 ++-- lib/axios.js | 2 +- lib/{helpers => core}/settle.js | 0 lib/{helpers => core}/transformData.js | 0 test/specs/{helpers => core}/settle.spec.js | 4 ++-- test/specs/{helpers => core}/transformData.spec.js | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) rename lib/{helpers => core}/settle.js (100%) rename lib/{helpers => core}/transformData.js (100%) rename test/specs/{helpers => core}/settle.spec.js (95%) rename test/specs/{helpers => core}/transformData.spec.js (83%) diff --git a/lib/adapters/README.md b/lib/adapters/README.md index 1ddee31..d3cb189 100644 --- a/lib/adapters/README.md +++ b/lib/adapters/README.md @@ -5,8 +5,8 @@ The modules under `adapters/` are modules that handle dispatching a request and ## Example ```js -var settle = require('../helpers/settle'); -var transformData = require('./../helpers/transformData'); +var settle = require('./../core/settle'); +var transformData = require('./../core/transformData'); module.exports myAdapter(resolve, reject, config) { // At this point: diff --git a/lib/adapters/http.js b/lib/adapters/http.js index 23c40f5..464e19f 100644 --- a/lib/adapters/http.js +++ b/lib/adapters/http.js @@ -1,8 +1,9 @@ 'use strict'; var utils = require('./../utils'); +var settle = require('./../core/settle'); +var transformData = require('./../core/transformData'); var buildURL = require('./../helpers/buildURL'); -var transformData = require('./../helpers/transformData'); var http = require('http'); var https = require('https'); var httpFollow = require('follow-redirects').http; @@ -11,7 +12,6 @@ var url = require('url'); var zlib = require('zlib'); var pkg = require('./../../package.json'); var Buffer = require('buffer').Buffer; -var settle = require('../helpers/settle'); /*eslint consistent-return:0*/ module.exports = function httpAdapter(resolve, reject, config) { diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js index 8c790c1..5d08dee 100644 --- a/lib/adapters/xhr.js +++ b/lib/adapters/xhr.js @@ -1,12 +1,12 @@ 'use strict'; var utils = require('./../utils'); +var settle = require('./../core/settle'); +var transformData = require('./../core/transformData'); var buildURL = require('./../helpers/buildURL'); var parseHeaders = require('./../helpers/parseHeaders'); -var transformData = require('./../helpers/transformData'); var isURLSameOrigin = require('./../helpers/isURLSameOrigin'); var btoa = (typeof window !== 'undefined' && window.btoa) || require('./../helpers/btoa'); -var settle = require('../helpers/settle'); module.exports = function xhrAdapter(resolve, reject, config) { var requestData = config.data; diff --git a/lib/axios.js b/lib/axios.js index cf25c86..aba64ec 100644 --- a/lib/axios.js +++ b/lib/axios.js @@ -3,11 +3,11 @@ var defaults = require('./defaults'); var utils = require('./utils'); var dispatchRequest = require('./core/dispatchRequest'); +var transformData = require('./core/transformData'); var InterceptorManager = require('./core/InterceptorManager'); var isAbsoluteURL = require('./helpers/isAbsoluteURL'); var combineURLs = require('./helpers/combineURLs'); var bind = require('./helpers/bind'); -var transformData = require('./helpers/transformData'); function Axios(defaultConfig) { this.defaults = utils.merge({}, defaultConfig); diff --git a/lib/helpers/settle.js b/lib/core/settle.js similarity index 100% rename from lib/helpers/settle.js rename to lib/core/settle.js diff --git a/lib/helpers/transformData.js b/lib/core/transformData.js similarity index 100% rename from lib/helpers/transformData.js rename to lib/core/transformData.js diff --git a/test/specs/helpers/settle.spec.js b/test/specs/core/settle.spec.js similarity index 95% rename from test/specs/helpers/settle.spec.js rename to test/specs/core/settle.spec.js index b89d12a..14e507f 100644 --- a/test/specs/helpers/settle.spec.js +++ b/test/specs/core/settle.spec.js @@ -1,6 +1,6 @@ -var settle = require('../../../lib/helpers/settle'); +var settle = require('../../../lib/core/settle'); -describe('helpers::settle', function() { +describe('core::settle', function() { var resolve; var reject; diff --git a/test/specs/helpers/transformData.spec.js b/test/specs/core/transformData.spec.js similarity index 83% rename from test/specs/helpers/transformData.spec.js rename to test/specs/core/transformData.spec.js index 9eccb7e..95479bd 100644 --- a/test/specs/helpers/transformData.spec.js +++ b/test/specs/core/transformData.spec.js @@ -1,6 +1,6 @@ -var transformData = require('../../../lib/helpers/transformData'); +var transformData = require('../../../lib/core/transformData'); -describe('helpers::transformData', function () { +describe('core::transformData', function () { it('should support a single transformer', function () { var data; data = transformData(data, null, function (data) {