From bbb4207a403bc3346ef36b359f21b9a0cadab838 Mon Sep 17 00:00:00 2001 From: Divyendu Singh Date: Wed, 24 Oct 2018 12:38:16 +0530 Subject: [PATCH 1/3] fix(graphql 14): bump deps --- package.json | 4 ++-- yarn.lock | 33 ++++++++++++++++----------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 2ab55a5..9099bed 100644 --- a/package.json +++ b/package.json @@ -34,14 +34,14 @@ "@types/node": "^9.4.6", "ava": "^0.25.0", "fetch-mock": "^6.0.1", - "graphql": "^0.13.1", + "graphql": "^0.13.1 || ^14.0.0", "tslint": "^5.9.1", "tslint-config-prettier": "^1.9.0", "tslint-config-standard": "^7.0.0", "typescript": "^2.7.2" }, "dependencies": { - "apollo-link": "^1.2.1", + "apollo-link": "^1.2.3", "cross-fetch": "2.2.2", "dataloader": "^1.4.0" } diff --git a/yarn.lock b/yarn.lock index 8e13a18..630a8a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -111,13 +111,12 @@ anymatch@^1.3.0: arrify "^1.0.0" micromatch "^2.1.5" -apollo-link@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.1.tgz#c120b16059f9bd93401b9f72b94d2f80f3f305d2" +apollo-link@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.3.tgz#9bd8d5fe1d88d31dc91dae9ecc22474d451fb70d" dependencies: - "@types/node" "^9.4.6" apollo-utilities "^1.0.0" - zen-observable-ts "^0.8.6" + zen-observable-ts "^0.8.10" apollo-utilities@^1.0.0: version "1.0.5" @@ -1393,11 +1392,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" -graphql@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.13.1.tgz#9b3db3d8e40d1827e4172404bfdd2e4e17a58b55" +"graphql@^0.13.1 || ^14.0.0": + version "14.0.2" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.0.2.tgz#7dded337a4c3fd2d075692323384034b357f5650" dependencies: - iterall "^1.2.0" + iterall "^1.2.2" har-schema@^1.0.5: version "1.0.5" @@ -1716,7 +1715,7 @@ isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" -iterall@^1.2.0: +iterall@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7" @@ -3033,12 +3032,12 @@ yallist@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" -zen-observable-ts@^0.8.6: - version "0.8.8" - resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.8.tgz#1a586dc204fa5632a88057f879500e0d2ba06869" +zen-observable-ts@^0.8.10: + version "0.8.10" + resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.10.tgz#18e2ce1c89fe026e9621fd83cc05168228fce829" dependencies: - zen-observable "^0.7.0" + zen-observable "^0.8.0" -zen-observable@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.7.1.tgz#f84075c0ee085594d3566e1d6454207f126411b3" +zen-observable@^0.8.0: + version "0.8.10" + resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.10.tgz#85ad75d41fed82e5b4651bd64ca117b2af960182" From 56826233b82a43cc59278d65336c69b4915d9ee0 Mon Sep 17 00:00:00 2001 From: Divyendu Singh Date: Wed, 24 Oct 2018 12:43:24 +0530 Subject: [PATCH 2/3] fix(graphql 14): fix package.json --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 9099bed..7a4352d 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,7 @@ "files": [ "dist" ], - "repository": { - "type": "git", - "url": "git+https://github.com/graphcool/http-link-dataloader.git" - }, + "repository": "git@github.com:prisma/http-link-dataloader.git", "keywords": [ "graphql", "request", From c3709815da01950a7aae35d527b5eef8e61b5726 Mon Sep 17 00:00:00 2001 From: Divyendu Singh Date: Wed, 24 Oct 2018 12:49:42 +0530 Subject: [PATCH 3/3] Revert "fix(graphql 14): fix package.json" This reverts commit 56826233b82a43cc59278d65336c69b4915d9ee0. --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a4352d..9099bed 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,10 @@ "files": [ "dist" ], - "repository": "git@github.com:prisma/http-link-dataloader.git", + "repository": { + "type": "git", + "url": "git+https://github.com/graphcool/http-link-dataloader.git" + }, "keywords": [ "graphql", "request",