Skip to content

Commit 8b49cc1

Browse files
committed
refactor(kitsu): use merge-options instead of Object.assign
1 parent 85937c4 commit 8b49cc1

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

packages/kitsu/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
"dependencies": {
4949
"axios": "^0.19.0",
5050
"kitsu-core": "^9.1.11",
51-
"pluralize": "^8.0.0"
51+
"pluralize": "^8.0.0",
52+
"merge-options": "^2.0.0"
5253
},
5354
"size-limit": [
5455
{

packages/kitsu/src/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { camel, deserialise, error, kebab, query, serialise, snake, splitModel } from 'kitsu-core'
22
import axios from 'axios'
3+
import merge from 'merge-options'
34
import pluralise from 'pluralize'
45
import { camel, deserialise, error, kebab, query, serialise, snake, splitModel } from 'kitsu-core'
56

@@ -444,7 +445,7 @@ export default class Kitsu {
444445
camelCaseTypes: this.camel,
445446
pluralTypes: this.plural
446447
}),
447-
headers: Object.assign(this.headers, headers),
448+
headers: merge(this.headers, headers),
448449
params,
449450
paramsSerializer: /* istanbul ignore next */ p => query(p)
450451
})

yarn.lock

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7370,6 +7370,11 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
73707370
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
73717371
integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
73727372

7373+
is-plain-obj@^2.0.0:
7374+
version "2.1.0"
7375+
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
7376+
integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
7377+
73737378
is-plain-object@^2.0.3, is-plain-object@^2.0.4:
73747379
version "2.0.4"
73757380
resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -8605,6 +8610,13 @@ merge-descriptors@1.0.1:
86058610
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
86068611
integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
86078612

8613+
merge-options@^2.0.0:
8614+
version "2.0.0"
8615+
resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-2.0.0.tgz#36ca5038badfc3974dbde5e58ba89d3df80882c3"
8616+
integrity sha512-S7xYIeWHl2ZUKF7SDeBhGg6rfv5bKxVBdk95s/I7wVF8d+hjLSztJ/B271cnUiF6CAFduEQ5Zn3HYwAjT16DlQ==
8617+
dependencies:
8618+
is-plain-obj "^2.0.0"
8619+
86088620
merge-stream@^2.0.0:
86098621
version "2.0.0"
86108622
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"

0 commit comments

Comments
 (0)