diff --git a/packages/api-axios/package-lock.json b/packages/api-axios/package-lock.json index e1fd55f45..b88a197e4 100644 --- a/packages/api-axios/package-lock.json +++ b/packages/api-axios/package-lock.json @@ -19,14 +19,6 @@ "ms": "2.0.0" } }, - "deep-assign": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-2.0.0.tgz", - "integrity": "sha1-6+BrHwfwja5ZdiDj3RYi83GhxXI=", - "requires": { - "is-obj": "^1.0.0" - } - }, "follow-redirects": { "version": "1.4.1", "resolved": "http://repo.availity.com:8081/artifactory/api/npm/npm/follow-redirects/-/follow-redirects-1.4.1.tgz", @@ -40,10 +32,18 @@ "resolved": "http://repo.availity.com:8081/artifactory/api/npm/npm/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=" }, - "is-obj": { + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" + }, + "merge-options": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-1.0.1.tgz", + "integrity": "sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==", + "requires": { + "is-plain-obj": "^1.1" + } }, "ms": { "version": "2.0.0", diff --git a/packages/api-axios/package.json b/packages/api-axios/package.json index ac4beac03..d5f7b0ace 100644 --- a/packages/api-axios/package.json +++ b/packages/api-axios/package.json @@ -6,7 +6,7 @@ "author": "Kasey Powers ", "license": "MIT", "dependencies": { - "deep-assign": "^2.0.0" + "merge-options": "^1.0.1" }, "peerDependencies": { "@availity/api-core": "^2.0.1", diff --git a/packages/api-axios/src/api.js b/packages/api-axios/src/api.js index 166daf099..69d28adc6 100644 --- a/packages/api-axios/src/api.js +++ b/packages/api-axios/src/api.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import Api from '@availity/api-core'; export default class AvApi extends Api { diff --git a/packages/api-axios/src/files.js b/packages/api-axios/src/files.js index 3da94b285..229eefb84 100644 --- a/packages/api-axios/src/files.js +++ b/packages/api-axios/src/files.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvFiles } from '@availity/api-core'; export default new AvFiles({ diff --git a/packages/api-axios/src/logs.js b/packages/api-axios/src/logs.js index 7c63768f6..3d13f6cc2 100644 --- a/packages/api-axios/src/logs.js +++ b/packages/api-axios/src/logs.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvLogMessages } from '@availity/api-core'; export default new AvLogMessages({ diff --git a/packages/api-axios/src/ms.js b/packages/api-axios/src/ms.js index 4f460d71e..8c2effe0b 100644 --- a/packages/api-axios/src/ms.js +++ b/packages/api-axios/src/ms.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvMicroservice } from '@availity/api-core'; export default class AvMicroserviceApi extends AvMicroservice { diff --git a/packages/api-axios/src/navigation.js b/packages/api-axios/src/navigation.js index 8f9f4af18..a8a8b3cfc 100644 --- a/packages/api-axios/src/navigation.js +++ b/packages/api-axios/src/navigation.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvNavigation } from '@availity/api-core'; export default new AvNavigation({ diff --git a/packages/api-axios/src/notification.js b/packages/api-axios/src/notification.js index c841333f1..3ba30f17b 100644 --- a/packages/api-axios/src/notification.js +++ b/packages/api-axios/src/notification.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvNotification } from '@availity/api-core'; class AvNotificationApi extends AvNotification { diff --git a/packages/api-axios/src/organizations.js b/packages/api-axios/src/organizations.js index b851fd362..411d925cc 100644 --- a/packages/api-axios/src/organizations.js +++ b/packages/api-axios/src/organizations.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvOrganizations } from '@availity/api-core'; import avUserApi from './user'; diff --git a/packages/api-axios/src/pdf.js b/packages/api-axios/src/pdf.js index 709d0b9bc..ed0015c9e 100644 --- a/packages/api-axios/src/pdf.js +++ b/packages/api-axios/src/pdf.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvPdf } from '@availity/api-core'; export default new AvPdf({ diff --git a/packages/api-axios/src/permissions.js b/packages/api-axios/src/permissions.js index 024a0f480..be3afaaf8 100644 --- a/packages/api-axios/src/permissions.js +++ b/packages/api-axios/src/permissions.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvPermissions } from '@availity/api-core'; export default new AvPermissions({ diff --git a/packages/api-axios/src/providers.js b/packages/api-axios/src/providers.js index e9087e4b6..a992bce4f 100644 --- a/packages/api-axios/src/providers.js +++ b/packages/api-axios/src/providers.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvProviders } from '@availity/api-core'; export default new AvProviders({ diff --git a/packages/api-axios/src/proxy.js b/packages/api-axios/src/proxy.js index 904523ff3..dc61010a1 100644 --- a/packages/api-axios/src/proxy.js +++ b/packages/api-axios/src/proxy.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvProxy } from '@availity/api-core'; export default class AvProxyApi extends AvProxy { diff --git a/packages/api-axios/src/regions.js b/packages/api-axios/src/regions.js index edd053465..e7fa5a548 100644 --- a/packages/api-axios/src/regions.js +++ b/packages/api-axios/src/regions.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvRegions } from '@availity/api-core'; import userApi from './user'; diff --git a/packages/api-axios/src/settings.js b/packages/api-axios/src/settings.js index a909c5a2e..ed39a4d7c 100644 --- a/packages/api-axios/src/settings.js +++ b/packages/api-axios/src/settings.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvSettings } from '@availity/api-core'; import userApi from './user'; diff --git a/packages/api-axios/src/spaces.js b/packages/api-axios/src/spaces.js index 9a8c544d4..7bbd03366 100644 --- a/packages/api-axios/src/spaces.js +++ b/packages/api-axios/src/spaces.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvSpaces } from '@availity/api-core'; export default new AvSpaces({ diff --git a/packages/api-axios/src/user.js b/packages/api-axios/src/user.js index 85e898f2f..8a1ceb724 100644 --- a/packages/api-axios/src/user.js +++ b/packages/api-axios/src/user.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvUsers } from '@availity/api-core'; export default new AvUsers({ diff --git a/packages/api-axios/src/userPermissions.js b/packages/api-axios/src/userPermissions.js index a5ee0fea2..e2e705cee 100644 --- a/packages/api-axios/src/userPermissions.js +++ b/packages/api-axios/src/userPermissions.js @@ -1,5 +1,5 @@ import axios from 'axios'; -import merge from 'deep-assign'; +import merge from 'merge-options'; import { AvUserPermissions } from '@availity/api-core'; export default new AvUserPermissions({