fix: downgrade to subgraph 2.2.3

kamilmysliwiec · kamilmysliwiec · commit 0656f094b7d8 · 2023-03-10T12:42:43.000+01:00
diff --git a/packages/apollo/package.json b/packages/apollo/package.json
@@ -25,7 +25,7 @@
     "@apollo/gateway": "2.3.3",
     "@apollo/server": "4.4.1",
     "@apollo/server-plugin-response-cache": "4.1.0",
-    "@apollo/subgraph": "2.3.3",
+    "@apollo/subgraph": "2.2.3",
     "@as-integrations/fastify": "1.3.2",
     "@nestjs/common": "9.3.9",
     "@nestjs/core": "9.3.9",
diff --git a/packages/apollo/tests/e2e/__snapshots__/code-first-federation.spec.ts.snap b/packages/apollo/tests/e2e/__snapshots__/code-first-federation.spec.ts.snap
@@ -3,7 +3,7 @@
 exports[`Code-first - Federation should return query result 1`] = `
 {
   "_service": {
-    "sdl": "directive @key(fields: String!, resolvable: Boolean = true) on OBJECT | INTERFACE
+    "sdl": "directive @key(fields: String!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
 
 directive @extends on OBJECT | INTERFACE
 
diff --git a/packages/apollo/tests/generated-definitions/federation-partial-query.fixture.ts b/packages/apollo/tests/generated-definitions/federation-partial-query.fixture.ts
@@ -12,5 +12,4 @@ export interface IQuery {
     foo(): Nullable<boolean> | Promise<Nullable<boolean>>;
 }
 
-export type _FieldSet = any;
 type Nullable<T> = T | null;
diff --git a/packages/apollo/tests/generated-definitions/federation-typedef.fixture.ts b/packages/apollo/tests/generated-definitions/federation-typedef.fixture.ts
@@ -33,5 +33,4 @@ export class User {
     posts?: Nullable<Nullable<Post>[]>;
 }
 
-export type _FieldSet = any;
 type Nullable<T> = T | null;
diff --git a/packages/apollo/tests/generated-definitions/federation.fixture.ts b/packages/apollo/tests/generated-definitions/federation.fixture.ts
@@ -28,5 +28,4 @@ export class User {
     posts?: Nullable<Nullable<Post>[]>;
 }
 
-export type _FieldSet = any;
 type Nullable<T> = T | null;
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
@@ -34,7 +34,7 @@
     "ws": "8.12.1"
   },
   "devDependencies": {
-    "@apollo/subgraph": "2.3.3",
+    "@apollo/subgraph": "2.2.3",
     "@nestjs/common": "9.3.9",
     "@nestjs/core": "9.3.9",
     "@nestjs/testing": "9.3.9",
diff --git a/yarn.lock b/yarn.lock
@@ -23,7 +23,7 @@
     "@apollo/federation-internals" "2.3.3"
     "@apollo/query-graphs" "2.3.3"
 
-"@apollo/federation-internals@2.3.3":
+"@apollo/federation-internals@2.3.3", "@apollo/federation-internals@^2.2.3":
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/@apollo/federation-internals/-/federation-internals-2.3.3.tgz#10663c0936fab24e66e3e3896aae91ccbeef4e89"
   integrity sha512-QzqgwQ57ZsvzExCo/dMxZL38E2cALXkn6fG93c89VPwo+4Kpo87I7DNDJgYVDSYzNosemW9ya1jGFRvwjyfQMw==
@@ -151,13 +151,13 @@
     uuid "^9.0.0"
     whatwg-mimetype "^3.0.0"
 
-"@apollo/subgraph@2.3.3":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@apollo/subgraph/-/subgraph-2.3.3.tgz#f2a24cfcb2d0ef8b2086aadcbbd15d22f416708b"
-  integrity sha512-stYoQ/pvm1TlSEU7DeW1YEk2cQ4yYIaS9tAEiPWTLzWivMwfbgVrsSGwBgME3UZ605EqHPXx4D1wVC/YfHT53Q==
+"@apollo/subgraph@2.2.3":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@apollo/subgraph/-/subgraph-2.2.3.tgz#cef1fee9a705f52aac22a37a1d4f6c902c63c00e"
+  integrity sha512-y7SdZaDbRJXq6xQcwT5Xj/KR1RAV9cokKK0XcMIBGvXcUXdMVorFxX2pYGzxyiIM7y4qFsAF/L8+0G5dtrnkZw==
   dependencies:
     "@apollo/cache-control-types" "^1.0.2"
-    "@apollo/federation-internals" "2.3.3"
+    "@apollo/federation-internals" "^2.2.3"
 
 "@apollo/usage-reporting-protobuf@^4.0.0":
   version "4.0.2"

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	exports[`Code-first - Federation should return query result 1`] = `
`4`	`4`	`{`
`5`	`5`	`"_service": {`
`6`		`- "sdl": "directive @key(fields: String!, resolvable: Boolean = true) on OBJECT \| INTERFACE`
	`6`	`+ "sdl": "directive @key(fields: String!, resolvable: Boolean = true) repeatable on OBJECT \| INTERFACE`
`7`	`7`
`8`	`8`	`directive @extends on OBJECT \| INTERFACE`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,4 @@ export interface IQuery {`
`12`	`12`	`foo(): Nullable<boolean> \| Promise<Nullable<boolean>>;`
`13`	`13`	`}`
`14`	`14`
`15`		`-export type _FieldSet = any;`
`16`	`15`	`type Nullable<T> = T \| null;`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,4 @@ export class User {`
`33`	`33`	`posts?: Nullable<Nullable<Post>[]>;`
`34`	`34`	`}`
`35`	`35`
`36`		`-export type _FieldSet = any;`
`37`	`36`	`type Nullable<T> = T \| null;`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,4 @@ export class User {`
`28`	`28`	`posts?: Nullable<Nullable<Post>[]>;`
`29`	`29`	`}`
`30`	`30`
`31`		`-export type _FieldSet = any;`
`32`	`31`	`type Nullable<T> = T \| null;`