Skip to content

Commit

Permalink
Merge pull request #110 from chantouchsek/feat/upgrade-depedencies
Browse files Browse the repository at this point in the history
Upgrade dependencies
  • Loading branch information
chantouchsek authored Sep 19, 2021
2 parents 93e8c8f + eb6e360 commit e059ee4
Show file tree
Hide file tree
Showing 12 changed files with 1,247 additions and 1,244 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
language: node_js
node_js:
- 12
- 16
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-api-queries",
"version": "1.1.0",
"version": "1.1.1",
"description": "Elegant and simple way to build requests for REST API",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand All @@ -14,7 +14,7 @@
"watch": "tsc -w",
"start": "yarn link && nodemon",
"semantic-release": "semantic-release",
"prepublish": "yarn build",
"prepublish": "yarn test && yarn build",
"clean": "rimraf dist",
"prepare": "husky install"
},
Expand Down Expand Up @@ -43,40 +43,40 @@
"devDependencies": {
"@commitlint/cli": "^13.1.0",
"@commitlint/config-conventional": "^13.1.0",
"@nuxt/types": "^2.14.7",
"@nuxt/types": "^2.15.8",
"@types/escape-string-regexp": "^2.0.1",
"@types/jest": "^26.0.14",
"@types/jest": "^27.0.1",
"@types/lodash.merge": "^4.6.6",
"@types/node": "^16.7.10",
"@types/node": "^16.9.3",
"@types/qs": "^6.9.7",
"@typescript-eslint/eslint-plugin": "^4.15.1",
"@typescript-eslint/parser": "^4.4.1",
"@typescript-eslint/eslint-plugin": "^4.31.1",
"@typescript-eslint/parser": "^4.31.1",
"@vue/test-utils": "^1.2.2",
"axios": "^0.21.1",
"axios-mock-adapter": "^1.18.2",
"eslint": "^7.2.0",
"eslint-config-prettier": "^6.13.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-promise": "^4.3.1",
"husky": "^7.0.1",
"jest": "^27.0.6",
"nodemon": "^2.0.5",
"nuxt": "^2.15.7",
"prettier": "^2.1.2",
"axios": "^0.21.4",
"axios-mock-adapter": "^1.20.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^7.2.0",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-promise": "^5.1.0",
"husky": "^7.0.2",
"jest": "^27.2.0",
"nodemon": "^2.0.12",
"nuxt": "^2.15.8",
"prettier": "^2.4.1",
"rimraf": "^3.0.2",
"semantic-release": "^17.2.1",
"ts-jest": "^27.0.4",
"typescript": "^4.3.5"
"semantic-release": "^18.0.0",
"ts-jest": "^27.0.5",
"typescript": "^4.4.3"
},
"files": [
"dist",
"nuxt"
],
"dependencies": {
"camelcase-keys": "^6.2.2",
"camelcase-keys": "^7.0.0",
"lodash.merge": "^4.6.2",
"qs": "^6.9.6",
"snakecase-keys": "^4.0.2"
"qs": "^6.10.1",
"snakecase-keys": "^5.0.0"
}
}
9 changes: 6 additions & 3 deletions src/__tests__/base-proxy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ describe('BaseProxy', () => {
try {
await proxy.getMany()
} catch (e) {
expect(e.message).toBe('Vue Api Queries, No http library provided.')
const { message } = e as any
expect(message).toBe('Vue Api Queries, No http library provided.')
}
})

Expand Down Expand Up @@ -94,7 +95,8 @@ describe('BaseProxy', () => {
try {
await proxy.all()
} catch (e) {
expect(e.message).toBe('Network Error')
const { message } = e as any
expect(message).toBe('Network Error')
}
})

Expand Down Expand Up @@ -307,7 +309,8 @@ describe('BaseProxy', () => {
try {
await proxy.post(item)
} catch (e) {
expect(e.message).toBe('Request failed with status code 422')
const { message } = e as any
expect(message).toBe('Request failed with status code 422')
}
expect(validator.has('first_name')).toBeTruthy()
})
Expand Down
6 changes: 1 addition & 5 deletions src/__tests__/package.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import Vue from 'vue'
import VueApiQueries from '../'
import {
sleep,
addElemWithDataAppToBody,
disableTransitions,
} from '../util/createDom'
import { addElemWithDataAppToBody, disableTransitions, sleep } from '../util'
import { mount } from '@vue/test-utils'

describe('Vue Api Queries', () => {
Expand Down
3 changes: 1 addition & 2 deletions src/core/BaseProxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ import {
} from 'axios'
import type { Errors } from '..'
import Validator from './Validator'
import { hasFiles, objectToFormData } from '../util/formData'
import { hasFiles, objectToFormData, removeDoubleSlash } from '../util'
import qs, { ParsedQs } from 'qs'
import { removeDoubleSlash } from '../util/string'

const validator = Validator
const UNPROCESSABLE_ENTITY = 422
Expand Down
5 changes: 4 additions & 1 deletion src/core/BaseTransformer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ class BaseTransformer {
return items.map((item: T) => this.send(item, snakeKey))
}

static fetch<T>(item: T, camelKey?: boolean) {
static fetch<T extends Record<string, any>>(
item: T,
camelKey?: boolean,
): T | any {
return camelKey ? camelcaseKeys(item, { deep: true }) : item
}

Expand Down
2 changes: 1 addition & 1 deletion src/core/Validator.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { is, isArray } from '../util/objects'
import { is, isArray } from '../util'

class Validator {
public errors: any
Expand Down
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ export {
PaginationTransformer,
BaseProxy as BaseService,
}
export * from './util'
export default new VueApiQueries()
6 changes: 0 additions & 6 deletions src/util/createDom.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import { createWrapper } from '@vue/test-utils'

export function sleep(ms: number) {
return new Promise((resolve) => {
setTimeout(resolve, ms)
})
}

export function wrap(vm: any) {
return createWrapper(vm, {
attachedToDocument: true,
Expand Down
5 changes: 5 additions & 0 deletions src/util/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export * from './createDom'
export * from './formData'
export * from './objects'
export * from './promise'
export * from './string'
5 changes: 5 additions & 0 deletions src/util/promise.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export function sleep(ms: number) {
return new Promise((resolve) => {
setTimeout(resolve, ms)
})
}
Loading

0 comments on commit e059ee4

Please sign in to comment.