refactor: remove deprecated code

octokit · Nov 17, 2018 · 033254b · 033254b
1 parent 23d5a7b
commit 033254b
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 414 deletions.
diff --git a/lib/deprecate.js b/lib/deprecate.js
diff --git a/lib/endpoint/index.js b/lib/endpoint/index.js
diff --git a/lib/get-request-agent.js b/lib/get-request-agent.js
diff --git a/lib/parse-client-options.js b/lib/parse-client-options.js
@@ -2,10 +2,9 @@ module.exports = parseOptions
 
 const deepmerge = require('deepmerge')
 const getUserAgent = require('universal-user-agent')
+const isPlainObject = require('is-plain-object')
 const pick = require('lodash/pick')
 
-const deprecate = require('./deprecate')
-const getRequestAgent = require('./get-request-agent')
 const pkg = require('../package.json')
 
 const DEFAULTS = require('./defaults')
@@ -21,64 +20,22 @@ function parseOptions (userOptions) {
     userOptions = {}
   }
 
-  if ('followRedirects' in userOptions) {
-    deprecate('followRedirects option is no longer supported. All redirects are followed correctly')
-  }
-
-  if ('protocol' in userOptions) {
-    deprecate('protocol option is no longer supported')
-  }
-
-  if ('host' in userOptions) {
-    deprecate('host option is no longer supported')
-  }
-
-  if ('port' in userOptions) {
-    deprecate('port option is no longer supported')
-  }
-
-  if ('pathPrefix' in userOptions) {
-    deprecate('pathPrefix option is no longer supported')
-  }
-
-  if ('Promise' in userOptions) {
-    deprecate('Promise option is no longer supported. The native Promise API is used')
-  }
-
   if (userOptions.headers) {
     userOptions.headers = Object.keys(userOptions.headers).reduce((newObj, key) => {
       newObj[key.toLowerCase()] = userOptions.headers[key]
       return newObj
     }, {})
   }
 
-  const options = deepmerge(DEFAULTS, pick(userOptions, OPTION_NAMES))
+  const options = deepmerge(DEFAULTS, pick(userOptions, OPTION_NAMES), { isMergeableObject: isPlainObject })
 
   const clientDefaults = {
     baseUrl: options.baseUrl,
     headers: options.headers,
     request: {
-      timeout: options.timeout
-    }
-  }
-  if (userOptions.protocol) {
-    clientDefaults.baseUrl = `${userOptions.protocol}://${userOptions.host}`
-
-    /* istanbul ignore else */
-    if (userOptions.port) {
-      clientDefaults.baseUrl += `:${userOptions.port}`
+      timeout: options.timeout,
+      agent: options.agent
     }
-
-    // Check if a prefix is passed in the options and strip any leading or trailing slashes from it.
-    /* istanbul ignore else */
-    if (userOptions.pathPrefix) {
-      clientDefaults.baseUrl += '/' + userOptions.pathPrefix.replace(/(^[/]+|[/]+$)/g, '')
-    }
-  }
-  /* istanbul ignore else */
-
-  if (!process.browser) {
-    clientDefaults.request.agent = getRequestAgent(clientDefaults.baseUrl, userOptions)
   }
 
   const userAgentOption = clientDefaults.headers['user-agent']

diff --git a/lib/plugins/endpoint-methods/method.js b/lib/plugins/endpoint-methods/method.js
diff --git a/lib/request/http-error.js b/lib/request/http-error.js