Skip to content

Commit 85a35ac

Browse files
committed
fix: allow graphql-compose@4.0.0 as peerDependency
1 parent 19a41ce commit 85a35ac

File tree

3 files changed

+59
-48
lines changed

3 files changed

+59
-48
lines changed

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
},
2424
"homepage": "https://github.com/graphql-compose/graphql-compose-connection",
2525
"peerDependencies": {
26-
"graphql-compose": ">=3.0.0"
26+
"graphql-compose": ">=3.0.0 || >=4.0.0"
2727
},
2828
"devDependencies": {
2929
"babel-cli": "^6.26.0",
3030
"babel-core": "^6.26.0",
31-
"babel-eslint": "^8.2.2",
31+
"babel-eslint": "^8.2.3",
3232
"babel-jest": "^22.4.3",
3333
"babel-plugin-transform-flow-strip-types": "^6.22.0",
3434
"babel-plugin-transform-object-rest-spread": "^6.26.0",
@@ -38,16 +38,16 @@
3838
"eslint": "^4.19.1",
3939
"eslint-config-airbnb-base": "^12.1.0",
4040
"eslint-config-prettier": "^2.9.0",
41-
"eslint-plugin-flowtype": "^2.46.1",
42-
"eslint-plugin-import": "^2.10.0",
41+
"eslint-plugin-flowtype": "^2.46.2",
42+
"eslint-plugin-import": "^2.11.0",
4343
"eslint-plugin-prettier": "^2.6.0",
44-
"flow-bin": "^0.69.0",
44+
"flow-bin": "^0.70.0",
4545
"graphql": "0.13.2",
46-
"graphql-compose": "^3.1.1",
46+
"graphql-compose": "^4.0.0",
4747
"jest": "^22.4.3",
48-
"prettier": "^1.11.1",
48+
"prettier": "^1.12.0",
4949
"rimraf": "^2.6.2",
50-
"semantic-release": "^15.1.4"
50+
"semantic-release": "^15.1.7"
5151
},
5252
"dependencies": {
5353
"babel-runtime": "^6.26.0"

src/__tests__/connectionResolver-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,23 +81,23 @@ describe('connectionResolver', () => {
8181

8282
describe('resolver args', () => {
8383
it('should have `first` arg', () => {
84-
expect(connectionResolver.getArg('first').type).toBe(GraphQLInt);
84+
expect(connectionResolver.getArgType('first')).toBe(GraphQLInt);
8585
});
8686

8787
it('should have `last` arg', () => {
88-
expect(connectionResolver.getArg('last').type).toBe(GraphQLInt);
88+
expect(connectionResolver.getArgType('last')).toBe(GraphQLInt);
8989
});
9090

9191
it('should have `after` arg', () => {
92-
expect(connectionResolver.getArg('after').type).toBe(GraphQLString);
92+
expect(connectionResolver.getArgType('after')).toBe(GraphQLString);
9393
});
9494

9595
it('should have `before` arg', () => {
96-
expect(connectionResolver.getArg('before').type).toBe(GraphQLString);
96+
expect(connectionResolver.getArgType('before')).toBe(GraphQLString);
9797
});
9898

9999
it('should have `sort` arg', () => {
100-
expect(connectionResolver.getArg('sort').type.name).toBe('SortConnectionUserEnum');
100+
expect((connectionResolver.getArgType('sort'): any).name).toBe('SortConnectionUserEnum');
101101
});
102102
});
103103

yarn.lock

Lines changed: 46 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# yarn lockfile v1
33

44

5-
"@babel/code-frame@7.0.0-beta.44", "@babel/code-frame@^7.0.0-beta.40":
5+
"@babel/code-frame@7.0.0-beta.44":
66
version "7.0.0-beta.44"
77
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
88
dependencies:
@@ -63,7 +63,7 @@
6363
babylon "7.0.0-beta.44"
6464
lodash "^4.2.0"
6565

66-
"@babel/traverse@^7.0.0-beta.40":
66+
"@babel/traverse@7.0.0-beta.44":
6767
version "7.0.0-beta.44"
6868
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
6969
dependencies:
@@ -78,7 +78,7 @@
7878
invariant "^2.2.0"
7979
lodash "^4.2.0"
8080

81-
"@babel/types@7.0.0-beta.44", "@babel/types@^7.0.0-beta.40":
81+
"@babel/types@7.0.0-beta.44":
8282
version "7.0.0-beta.44"
8383
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
8484
dependencies:
@@ -497,14 +497,14 @@ babel-core@^6.0.0, babel-core@^6.26.0:
497497
slash "^1.0.0"
498498
source-map "^0.5.6"
499499

500-
babel-eslint@^8.2.2:
501-
version "8.2.2"
502-
resolved "http://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.2.tgz#1102273354c6f0b29b4ea28a65f97d122296b68b"
500+
babel-eslint@^8.2.3:
501+
version "8.2.3"
502+
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.3.tgz#1a2e6681cc9bc4473c32899e59915e19cd6733cf"
503503
dependencies:
504-
"@babel/code-frame" "^7.0.0-beta.40"
505-
"@babel/traverse" "^7.0.0-beta.40"
506-
"@babel/types" "^7.0.0-beta.40"
507-
babylon "^7.0.0-beta.40"
504+
"@babel/code-frame" "7.0.0-beta.44"
505+
"@babel/traverse" "7.0.0-beta.44"
506+
"@babel/types" "7.0.0-beta.44"
507+
babylon "7.0.0-beta.44"
508508
eslint-scope "~3.7.1"
509509
eslint-visitor-keys "^1.0.0"
510510

@@ -992,7 +992,7 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26
992992
lodash "^4.17.4"
993993
to-fast-properties "^1.0.3"
994994

995-
babylon@7.0.0-beta.44, babylon@^7.0.0-beta.40:
995+
babylon@7.0.0-beta.44:
996996
version "7.0.0-beta.44"
997997
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
998998

@@ -1117,7 +1117,7 @@ btoa-lite@^1.0.0:
11171117
version "1.0.0"
11181118
resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
11191119

1120-
builtin-modules@^1.0.0, builtin-modules@^1.1.1:
1120+
builtin-modules@^1.0.0:
11211121
version "1.1.1"
11221122
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
11231123

@@ -1725,17 +1725,16 @@ eslint-module-utils@^2.2.0:
17251725
debug "^2.6.8"
17261726
pkg-dir "^1.0.0"
17271727

1728-
eslint-plugin-flowtype@^2.46.1:
1729-
version "2.46.1"
1730-
resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.46.1.tgz#c4f81d580cd89c82bc3a85a1ccf4ae3a915143a4"
1728+
eslint-plugin-flowtype@^2.46.2:
1729+
version "2.46.2"
1730+
resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.46.2.tgz#8749fddda6f6c30d0672011151bea726765b5753"
17311731
dependencies:
17321732
lodash "^4.15.0"
17331733

1734-
eslint-plugin-import@^2.10.0:
1735-
version "2.10.0"
1736-
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.10.0.tgz#fa09083d5a75288df9c6c7d09fe12255985655e7"
1734+
eslint-plugin-import@^2.11.0:
1735+
version "2.11.0"
1736+
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.11.0.tgz#15aeea37a67499d848e8e981806d4627b5503816"
17371737
dependencies:
1738-
builtin-modules "^1.1.1"
17391738
contains-path "^0.1.0"
17401739
debug "^2.6.8"
17411740
doctrine "1.5.0"
@@ -1745,6 +1744,7 @@ eslint-plugin-import@^2.10.0:
17451744
lodash "^4.17.4"
17461745
minimatch "^3.0.3"
17471746
read-pkg-up "^2.0.0"
1747+
resolve "^1.6.0"
17481748

17491749
eslint-plugin-prettier@^2.6.0:
17501750
version "2.6.0"
@@ -2077,9 +2077,9 @@ flat-cache@^1.2.1:
20772077
graceful-fs "^4.1.2"
20782078
write "^0.2.1"
20792079

2080-
flow-bin@^0.69.0:
2081-
version "0.69.0"
2082-
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.69.0.tgz#053159a684a6051fcbf0b71a2eb19a9679082da6"
2080+
flow-bin@^0.70.0:
2081+
version "0.70.0"
2082+
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.70.0.tgz#080ae83a997f2b4ddb3dc2649bf13336825292b5"
20832083

20842084
for-in@^1.0.1, for-in@^1.0.2:
20852085
version "1.0.2"
@@ -2250,11 +2250,12 @@ git-url-parse@^8.0.0:
22502250
dependencies:
22512251
git-up "^2.0.0"
22522252

2253-
git-url-parse@^8.1.0:
2254-
version "8.2.0"
2255-
resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-8.2.0.tgz#74969b0105f805df58873ee5b96bc1a4dc0573b1"
2253+
git-url-parse@^9.0.0:
2254+
version "9.0.0"
2255+
resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-9.0.0.tgz#a82a36acc3544c77ed0984d6488b37fbcfbec24d"
22562256
dependencies:
22572257
git-up "^2.0.0"
2258+
parse-domain "^2.0.0"
22582259

22592260
glob-base@^0.3.0:
22602261
version "0.3.0"
@@ -2326,9 +2327,9 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
23262327
version "4.1.11"
23272328
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
23282329

2329-
graphql-compose@^3.1.1:
2330-
version "3.1.1"
2331-
resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-3.1.1.tgz#97fcf4f4a0aa5d58906eb9ec4166cbf426437c73"
2330+
graphql-compose@^4.0.0:
2331+
version "4.0.0"
2332+
resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-4.0.0.tgz#6b260dc4e220c33feae46e50e34edd9072ef0244"
23322333
dependencies:
23332334
babel-runtime "^6.26.0"
23342335
object-path "^0.11.4"
@@ -3923,6 +3924,10 @@ p-retry@^1.0.0:
39233924
dependencies:
39243925
retry "^0.10.0"
39253926

3927+
parse-domain@^2.0.0:
3928+
version "2.0.0"
3929+
resolved "https://registry.yarnpkg.com/parse-domain/-/parse-domain-2.0.0.tgz#e9f42f697c30f7c2051dc5c55ff4d8a80da7943c"
3930+
39263931
parse-github-url@^1.0.1:
39273932
version "1.0.2"
39283933
resolved "https://registry.yarnpkg.com/parse-github-url/-/parse-github-url-1.0.2.tgz#242d3b65cbcdda14bb50439e3242acf6971db395"
@@ -4076,9 +4081,9 @@ preserve@^0.2.0:
40764081
version "0.2.0"
40774082
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
40784083

4079-
prettier@^1.11.1:
4080-
version "1.11.1"
4081-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
4084+
prettier@^1.12.0:
4085+
version "1.12.0"
4086+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.0.tgz#d26fc5894b9230de97629b39cae225b503724ce8"
40824087

40834088
pretty-format@^22.4.3:
40844089
version "22.4.3"
@@ -4460,6 +4465,12 @@ resolve@^1.2.0:
44604465
dependencies:
44614466
path-parse "^1.0.5"
44624467

4468+
resolve@^1.6.0:
4469+
version "1.7.1"
4470+
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
4471+
dependencies:
4472+
path-parse "^1.0.5"
4473+
44634474
restore-cursor@^2.0.0:
44644475
version "2.0.0"
44654476
resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -4535,9 +4546,9 @@ sax@^1.2.4:
45354546
version "1.2.4"
45364547
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
45374548

4538-
semantic-release@^15.1.4:
4539-
version "15.1.4"
4540-
resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-15.1.4.tgz#000ddbd8a8977dc1a68cacfbeef2fb551e4b9791"
4549+
semantic-release@^15.1.7:
4550+
version "15.1.7"
4551+
resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-15.1.7.tgz#b29eef1b9443f75addab7c2e353338b72b9b628d"
45414552
dependencies:
45424553
"@semantic-release/commit-analyzer" "^5.0.0"
45434554
"@semantic-release/error" "^2.2.0"
@@ -4552,7 +4563,7 @@ semantic-release@^15.1.4:
45524563
execa "^0.10.0"
45534564
get-stream "^3.0.0"
45544565
git-log-parser "^1.2.0"
4555-
git-url-parse "^8.1.0"
4566+
git-url-parse "^9.0.0"
45564567
hook-std "^0.4.0"
45574568
hosted-git-info "^2.6.0"
45584569
lodash "^4.17.4"

0 commit comments

Comments
 (0)