Skip to content

Commit

Permalink
fix(api-axios): us merge-options for merge
Browse files Browse the repository at this point in the history
  • Loading branch information
TheSharpieOne committed Sep 6, 2018
1 parent 4d2d0be commit 25b75b4
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 28 deletions.
22 changes: 11 additions & 11 deletions packages/api-axios/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/api-axios/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "Kasey Powers <kasey.powers@availity.com>",
"license": "MIT",
"dependencies": {
"deep-assign": "^2.0.0"
"merge-options": "^1.0.1"
},
"peerDependencies": {
"@availity/api-core": "^2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/api.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/files.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/logs.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/ms.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/navigation.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/notification.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/organizations.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/pdf.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/permissions.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/providers.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/proxy.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/regions.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/settings.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/spaces.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/user.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
2 changes: 1 addition & 1 deletion packages/api-axios/src/userPermissions.js
Original file line number Diff line number Diff line change
@@ -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({
Expand Down

0 comments on commit 25b75b4

Please sign in to comment.