Skip to content

Commit e5fbc42

Browse files
committed
feat: add graphql-compose@^8.0.0 to peer dependencies and update other dependencies
1 parent 1a8aa26 commit e5fbc42

File tree

5 files changed

+947
-807
lines changed

5 files changed

+947
-807
lines changed

.eslintrc.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ const path = require('path');
33
module.exports = {
44
parser: '@typescript-eslint/parser',
55
plugins: ['@typescript-eslint', 'prettier'],
6-
extends: [
7-
'plugin:@typescript-eslint/recommended',
8-
'prettier/@typescript-eslint',
9-
'plugin:prettier/recommended',
10-
],
6+
extends: ['plugin:@typescript-eslint/recommended', 'prettier', 'plugin:prettier/recommended'],
117
parserOptions: {
128
sourceType: 'module',
139
useJSXTextNode: true,

package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,26 @@
2323
},
2424
"homepage": "https://github.com/graphql-compose/graphql-compose-pagination",
2525
"peerDependencies": {
26-
"graphql-compose": "^7.15.0"
26+
"graphql-compose": "^7.15.0 || ^8.0.0"
2727
},
2828
"devDependencies": {
2929
"@types/graphql": "14.5.0",
30-
"@types/jest": "26.0.13",
31-
"@typescript-eslint/eslint-plugin": "4.1.0",
32-
"@typescript-eslint/parser": "4.1.0",
33-
"eslint": "7.9.0",
34-
"eslint-config-airbnb-base": "14.2.0",
35-
"eslint-config-prettier": "6.11.0",
36-
"eslint-plugin-import": "2.22.0",
37-
"eslint-plugin-prettier": "3.1.4",
38-
"graphql": "15.3.0",
39-
"graphql-compose": "7.21.1",
40-
"jest": "26.4.2",
41-
"prettier": "2.1.1",
30+
"@types/jest": "26.0.23",
31+
"@typescript-eslint/eslint-plugin": "4.22.0",
32+
"@typescript-eslint/parser": "4.22.0",
33+
"eslint": "7.25.0",
34+
"eslint-config-airbnb-base": "14.2.1",
35+
"eslint-config-prettier": "8.3.0",
36+
"eslint-plugin-import": "2.22.1",
37+
"eslint-plugin-prettier": "3.4.0",
38+
"graphql": "15.5.0",
39+
"graphql-compose": "8.0.0",
40+
"jest": "26.6.3",
41+
"prettier": "2.2.1",
4242
"rimraf": "3.0.2",
43-
"semantic-release": "17.1.1",
44-
"ts-jest": "26.3.0",
45-
"typescript": "4.0.2"
43+
"semantic-release": "17.4.2",
44+
"ts-jest": "26.5.5",
45+
"typescript": "4.2.4"
4646
},
4747
"scripts": {
4848
"build": "rimraf lib && tsc -p ./tsconfig.build.json",

src/pagination.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export function preparePaginationResolver<TSource, TContext>(
9898
description: '',
9999
defaultValue: opts.perPage || DEFAULT_PER_PAGE,
100100
},
101-
...additionalArgs,
101+
...(additionalArgs as any),
102102
},
103103
resolve: async (rp: ResolverResolveParams<TSource, TContext, PaginationTArgs>) => {
104104
let countPromise;

src/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export function preparePaginationInfoTC<TContext>(
2828
sc: SchemaComposer<TContext>
2929
): ObjectTypeComposer<any, TContext> {
3030
// Pagination Info can be overrided via SchemaComposer registry
31-
if (sc.hasInstance('PaginationInfo', ObjectTypeComposer)) {
31+
if (sc.has('PaginationInfo')) {
3232
return sc.getOTC('PaginationInfo');
3333
}
3434
sc.set('PaginationInfo', PaginationInfoTC);

0 commit comments

Comments
 (0)