Skip to content

Commit

Permalink
feat: add graphql-compose@^8.0.0 to peer dependencies and update ot…
Browse files Browse the repository at this point in the history
…her dependencies
  • Loading branch information
nodkz committed Apr 30, 2021
1 parent 1a8aa26 commit e5fbc42
Show file tree
Hide file tree
Showing 5 changed files with 947 additions and 807 deletions.
6 changes: 1 addition & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ const path = require('path');
module.exports = {
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint', 'prettier'],
extends: [
'plugin:@typescript-eslint/recommended',
'prettier/@typescript-eslint',
'plugin:prettier/recommended',
],
extends: ['plugin:@typescript-eslint/recommended', 'prettier', 'plugin:prettier/recommended'],
parserOptions: {
sourceType: 'module',
useJSXTextNode: true,
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,26 @@
},
"homepage": "https://github.com/graphql-compose/graphql-compose-pagination",
"peerDependencies": {
"graphql-compose": "^7.15.0"
"graphql-compose": "^7.15.0 || ^8.0.0"
},
"devDependencies": {
"@types/graphql": "14.5.0",
"@types/jest": "26.0.13",
"@typescript-eslint/eslint-plugin": "4.1.0",
"@typescript-eslint/parser": "4.1.0",
"eslint": "7.9.0",
"eslint-config-airbnb-base": "14.2.0",
"eslint-config-prettier": "6.11.0",
"eslint-plugin-import": "2.22.0",
"eslint-plugin-prettier": "3.1.4",
"graphql": "15.3.0",
"graphql-compose": "7.21.1",
"jest": "26.4.2",
"prettier": "2.1.1",
"@types/jest": "26.0.23",
"@typescript-eslint/eslint-plugin": "4.22.0",
"@typescript-eslint/parser": "4.22.0",
"eslint": "7.25.0",
"eslint-config-airbnb-base": "14.2.1",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-prettier": "3.4.0",
"graphql": "15.5.0",
"graphql-compose": "8.0.0",
"jest": "26.6.3",
"prettier": "2.2.1",
"rimraf": "3.0.2",
"semantic-release": "17.1.1",
"ts-jest": "26.3.0",
"typescript": "4.0.2"
"semantic-release": "17.4.2",
"ts-jest": "26.5.5",
"typescript": "4.2.4"
},
"scripts": {
"build": "rimraf lib && tsc -p ./tsconfig.build.json",
Expand Down
2 changes: 1 addition & 1 deletion src/pagination.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export function preparePaginationResolver<TSource, TContext>(
description: '',
defaultValue: opts.perPage || DEFAULT_PER_PAGE,
},
...additionalArgs,
...(additionalArgs as any),
},
resolve: async (rp: ResolverResolveParams<TSource, TContext, PaginationTArgs>) => {
let countPromise;
Expand Down
2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function preparePaginationInfoTC<TContext>(
sc: SchemaComposer<TContext>
): ObjectTypeComposer<any, TContext> {
// Pagination Info can be overrided via SchemaComposer registry
if (sc.hasInstance('PaginationInfo', ObjectTypeComposer)) {
if (sc.has('PaginationInfo')) {
return sc.getOTC('PaginationInfo');
}
sc.set('PaginationInfo', PaginationInfoTC);
Expand Down
Loading

0 comments on commit e5fbc42

Please sign in to comment.