fix: several bug fixes, align tests, upgrade deps

Author: kamilmysliwiec

packages/apollo/lib/drivers/apollo-base.driver.ts

@@ -1,28 +1,20 @@
-//import { loadPackage } from '@nestjs/common/utils/load-package.util';
+import { loadPackage } from '@nestjs/common/utils/load-package.util';
 import { isFunction } from '@nestjs/common/utils/shared.utils';
 import { AbstractGraphQLDriver } from '@nestjs/graphql';
-import { loadPackage } from '@nestjs/common/utils/load-package.util';
 
-import { GraphQLError, GraphQLFormattedError, Kind } from 'graphql';
+import { GraphQLError, GraphQLFormattedError } from 'graphql';
 import * as omit from 'lodash.omit';
 import { ApolloDriverConfig } from '../interfaces';
 import { createAsyncIterator } from '../utils/async-iterator.util';
 
 import { ApolloServer, type BaseContext } from '@apollo/server';
-import {
-  ApolloServerErrorCode,
-  unwrapResolverError,
-} from '@apollo/server/errors';
-import { ApolloServerPluginDrainHttpServer } from '@apollo/server/plugin/drainHttpServer';
-import { ApolloServerPluginLandingPageLocalDefault } from '@apollo/server/plugin/landingPage/default';
+import { ApolloServerErrorCode } from '@apollo/server/errors';
 import { expressMiddleware } from '@apollo/server/express4';
+import { ApolloServerPluginLandingPageLocalDefault } from '@apollo/server/plugin/landingPage/default';
 import * as express from 'express';
 import * as http from 'node:http';
 
-import {
-  fastifyApolloHandler,
-  fastifyApolloDrainPlugin,
-} from '@as-integrations/fastify';
+import { fastifyApolloHandler } from '@as-integrations/fastify';
 import { HttpStatus } from '@nestjs/common';
 
 const apolloPredefinedExceptions: Partial<Record<HttpStatus, string>> = {
@@ -141,7 +133,8 @@ export abstract class ApolloBaseDriver<
        * should remove serverWillStart from default plugins.
        * after include plugins here
        */
-      plugins: [ApolloServerPluginDrainHttpServer({ httpServer })],
+      // TODO: fix - dont override plugins
+      // plugins: [ApolloServerPluginDrainHttpServer({ httpServer })],
     });
 
     await server.start();
@@ -174,7 +167,8 @@ export abstract class ApolloBaseDriver<
       resolvers,
       schema,
       ...options,
-      plugins: [fastifyApolloDrainPlugin(app)],
+      // TODO: fix - dont override plugin
+      //plugins: [fastifyApolloDrainPlugin(app)],
     });
 
     await server.start();

packages/apollo/package.json

@@ -15,39 +15,37 @@
     "url": "git+https://github.com/nestjs/graphql.git"
   },
   "scripts": {
-    "test:e2e": "jest --config ./tests/jest-e2e.ts --runInBand && yarn test:e2e:fed2",
-    "test:e2e:fed2": "jest --config ./tests/jest-e2e-fed2.ts --runInBand",
+    "test:e2e": "jest --config ./tests/jest-e2e.ts --runInBand",
     "test:e2e:dev": "jest --config ./tests/jest-e2e.ts --runInBand --watch"
   },
   "bugs": {
     "url": "https://github.com/nestjs/graphql/issues"
   },
   "devDependencies": {
-    "@apollo/gateway": "0.54.1",
-    "@apollo/gateway-v2": "npm:@apollo/[email protected]",
-    "@apollo/subgraph-v2": "npm:@apollo/[email protected]",
+    "@apollo/gateway": "2.2.3",
+    "@apollo/subgraph": "2.2.3",
     "@apollo/server-plugin-response-cache": "4.1.0",
+    "@as-integrations/fastify": "1.3.0",
     "@nestjs/common": "9.2.1",
     "@nestjs/core": "9.2.1",
     "@nestjs/platform-express": "9.2.1",
     "@nestjs/platform-fastify": "9.2.1",
     "@nestjs/testing": "9.2.1",
     "apollo-cache-inmemory": "1.6.6",
     "apollo-client": "2.6.10",
-    "apollo-link-ws": "1.0.20",
-    "graphql-16": "npm:[email protected]"
+    "apollo-link-ws": "1.0.20"
   },
   "dependencies": {
-    "@apollo/server": "^4.3.2",
-    "@as-integrations/fastify": "^1.3.0",
+    "@apollo/server": "4.3.2",
     "iterall": "1.3.0",
     "lodash.omit": "4.5.0",
     "tslib": "2.5.0"
   },
   "peerDependencies": {
-    "@apollo/gateway": "^0.44.1 || ^0.46.0 || ^0.48.0 || ^0.49.0 || ^0.50.0 || ^2.0.0",
+    "@apollo/gateway": "^2.0.0",
     "@apollo/subgraph": "^2.0.0",
-    "@nestjs/common": "^8.2.3 || ^9.0.0",
+    "@as-integrations/fastify": "^1.3.0",
+    "@nestjs/common": "^9.0.0",
     "@nestjs/core": "^9.2.1",
     "@nestjs/graphql": "^10.1.7",
     "graphql": "^16.6.0"
@@ -56,6 +54,9 @@
     "@apollo/gateway": {
       "optional": true
     },
+    "@as-integrations/fastify": {
+      "optional": true
+    },
     "@fastify/cors": {
       "optional": true
     },

packages/apollo/tests/code-first-federation/app.module.ts

@@ -1,6 +1,6 @@
+import { ApolloServerPluginInlineTraceDisabled } from '@apollo/server/plugin/disabled';
 import { Module } from '@nestjs/common';
 import { GraphQLModule } from '@nestjs/graphql';
-import { ApolloServerPluginInlineTraceDisabled } from '@apollo/server/plugin/disabled';
 import { ApolloDriverConfig } from '../../lib';
 import { ApolloFederationDriver } from '../../lib/drivers';
 import { PostModule } from './post/post.module';

packages/apollo/tests/code-first-federation/post/post.entity.ts

@@ -2,7 +2,6 @@ import { Directive, Field, ID, Int, ObjectType } from '@nestjs/graphql';
 
 @ObjectType()
 @Directive('@key(fields: "id")')
-@Directive('@cacheControl(maxAge: 30)')
 export class Post {
   @Field((type) => ID)
   public id: number;