From 7dcd239f3bc28220b9678e9e805c8e859a52f454 Mon Sep 17 00:00:00 2001 From: Mahesh Venkat Date: Fri, 30 Oct 2020 09:39:35 -0700 Subject: [PATCH 1/4] update apollo federation version to 0.20.4 --- examples/federation/property-service/index.js | 2 +- examples/federation/reviews-service/index.js | 4 ++-- package.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/federation/property-service/index.js b/examples/federation/property-service/index.js index 119277f..53f72a9 100644 --- a/examples/federation/property-service/index.js +++ b/examples/federation/property-service/index.js @@ -1,7 +1,7 @@ 'use strict'; const { ApolloServer } = require('apollo-server'); -const GraphQLComponent = require('./lib'); +const GraphQLComponent = require('../../../lib'); const PropertyDataSource = require('./datasource'); const resolvers = require('./resolvers'); const types = require('./types'); diff --git a/examples/federation/reviews-service/index.js b/examples/federation/reviews-service/index.js index 411757d..c81cda3 100644 --- a/examples/federation/reviews-service/index.js +++ b/examples/federation/reviews-service/index.js @@ -1,7 +1,7 @@ 'use strict'; const { ApolloServer } = require('apollo-server'); -const GraphQLComponent = require('./lib'); +const GraphQLComponent = require('../../../lib'); const ReviewsDataSource = require('./datasource'); const resolvers = require('./resolvers'); const types = require('./types'); @@ -25,4 +25,4 @@ const server = new ApolloServer({ server.listen().then(({ url }) => { console.log(`🚀 Server ready at ${url}`) -}); \ No newline at end of file +}); diff --git a/package.json b/package.json index 22d07fc..e3a8d87 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "repository": "https://github.com/ExpediaGroup/graphql-component", "license": "MIT", "dependencies": { - "@apollo/federation": "^0.10.3", + "@apollo/federation": "^0.20.4", "cuid": "^2.1.8", "debug": "^4.1.1", "graphql-tools": "^6.0.10", @@ -30,7 +30,7 @@ "lodash.set": "^4.3.2" }, "peerDependencies": { - "graphql": "^14.0.0" + "graphql": "^15.0.0" }, "devDependencies": { "@apollo/gateway": "^0.10.8", From 71b6b2a28568849ef0267132a3e9b6ba977f1ae8 Mon Sep 17 00:00:00 2001 From: Mahesh Venkat Date: Fri, 30 Oct 2020 11:56:25 -0700 Subject: [PATCH 2/4] changedd graphql version to ^14.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3a8d87..fb24054 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "apollo-server": "^2.13.1", "casual": "^1.6.0", "eslint": "^6.5.1", - "graphql": "^14", + "graphql": "^14.5.0 || ^15.0.0", "graphql-tag": "^2.10.3", "nyc": "^14.1.1", "tape": "^4.9.1" From bafe229928a0b2be60359050ca7888ea0c460e68 Mon Sep 17 00:00:00 2001 From: Mahesh Venkat Date: Fri, 30 Oct 2020 12:17:59 -0700 Subject: [PATCH 3/4] reverted back devdependecies and updated peer dependency --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fb24054..09e3e46 100644 --- a/package.json +++ b/package.json @@ -30,14 +30,14 @@ "lodash.set": "^4.3.2" }, "peerDependencies": { - "graphql": "^15.0.0" + "graphql": "^14.0.0 || ^15.0.0" }, "devDependencies": { "@apollo/gateway": "^0.10.8", "apollo-server": "^2.13.1", "casual": "^1.6.0", "eslint": "^6.5.1", - "graphql": "^14.5.0 || ^15.0.0", + "graphql": "^14.0.0 ", "graphql-tag": "^2.10.3", "nyc": "^14.1.1", "tape": "^4.9.1" From cae565cc63fc1828f83e23bdf272feba515d0a29 Mon Sep 17 00:00:00 2001 From: Mahesh Venkat Date: Fri, 30 Oct 2020 12:25:24 -0700 Subject: [PATCH 4/4] reverted back peer dependency to 14.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 09e3e46..c19b8df 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lodash.set": "^4.3.2" }, "peerDependencies": { - "graphql": "^14.0.0 || ^15.0.0" + "graphql": "^14.0.0" }, "devDependencies": { "@apollo/gateway": "^0.10.8",