fix: only merge simple objects (part II)

octokit · Oct 31, 2018 · d3e4f1d · d3e4f1d
1 parent 0105ad9
commit d3e4f1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/endpoint-with-defaults.js b/lib/endpoint-with-defaults.js
@@ -76,11 +76,9 @@ function endpointWithDefaults (defaults, route, options) {
   }
 
   // Only return body/request keys if present
-  const funk = Object.assign(
+  return Object.assign(
     { method, url, headers },
     typeof body !== 'undefined' ? { body } : null,
     options.request ? { request: options.request } : null
   )
-
-  return funk
 }
diff --git a/with-defaults.js b/with-defaults.js
@@ -1,11 +1,12 @@
 module.exports = withDefaults
 
 const merge = require('deepmerge')
+const isPlainObject = require('is-plain-object')
 
 const endpointWithDefaults = require('./lib/endpoint-with-defaults')
 
 function withDefaults (oldDefaults, newDefaults) {
-  const DEFAULTS = merge.all([oldDefaults, newDefaults].filter(Boolean))
+  const DEFAULTS = merge.all([oldDefaults, newDefaults].filter(Boolean), { isMergeableObject: isPlainObject })
   const endpoint = endpointWithDefaults.bind(null, DEFAULTS)
   endpoint.DEFAULTS = DEFAULTS
   endpoint.defaults = withDefaults.bind(null, DEFAULTS)