Merge pull request #1 from nestjs/master

merge

Author: roypeled

.circleci/config.yml

@@ -25,7 +25,7 @@ jobs:
   build:
     working_directory: ~/nest
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:16.17
     steps:
       - checkout
       - *restore-cache
@@ -38,14 +38,20 @@ jobs:
   e2e_tests:
     working_directory: ~/nest
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:16.17
     steps:
       - checkout
       - *restore-cache
       - *install-deps
       - run:
-          name: E2E tests
-          command: yarn test:e2e
+          name: E2E tests (graphql)
+          command: yarn test:e2e:graphql
+      - run:
+          name: E2E tests (apollo)
+          command: yarn test:e2e:apollo
+      - run:
+          name: E2E tests (mercurius)
+          command: yarn test:e2e:mercurius
 
 workflows:
   version: 2
@@ -55,4 +61,3 @@ workflows:
       - e2e_tests:
           requires:
             - build
-      

.github/ISSUE_TEMPLATE/Bug_report.yml

@@ -56,7 +56,7 @@ body:
       required: true
     attributes:
       label: "Expected behavior"
-      description: "A clear and concise description of what you expected to happend (or code)"
+      description: "A clear and concise description of what you expected to happen (or code)"
 
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/Regression.yml

@@ -68,7 +68,7 @@ body:
       required: true
     attributes:
       label: "Expected behavior"
-      description: "A clear and concise description of what you expected to happend (or code)"
+      description: "A clear and concise description of what you expected to happen (or code)"
 
   - type: textarea
     attributes:

.prettierignore

@@ -1,2 +1,5 @@
 packages/**/tests/generated-definitions/*.ts
-packages/**/tests/**/*.fixture.ts
+packages/**/tests/**/*.fixture.ts
+
+packages/**/tests/cases/**/*.ts
+packages/**/tests/cases/**/*.ts

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "10.0.13",
+  "version": "10.1.1",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "changelog": {

package.json

@@ -20,44 +20,47 @@
     "publish:next": "lerna publish --dist-tag next",
     "test:e2e": "lerna run test:e2e --parallel",
     "test:e2e:dev": "lerna run test:e2e:dev --parallel",
+    "test:e2e:apollo": "lerna run test:e2e --scope @nestjs/apollo --stream",
+    "test:e2e:graphql": "lerna run test:e2e --scope @nestjs/graphql --stream",
+    "test:e2e:mercurius": "lerna run test:e2e --scope @nestjs/mercurius --stream",
     "prepare": "husky install"
   },
   "resolutions": {
     "graphql": "15.8.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.0.1",
-    "@commitlint/config-angular": "17.0.0",
+    "@commitlint/cli": "17.1.2",
+    "@commitlint/config-angular": "17.1.0",
     "@types/graphql": "14.5.0",
-    "@types/jest": "27.5.1",
+    "@types/jest": "29.0.0",
     "@types/node": "17.0.0",
     "@types/node-fetch": "3.0.3",
     "@types/normalize-path": "3.0.0",
     "@types/ws": "8.5.3",
-    "@typescript-eslint/eslint-plugin": "5.27.0",
-    "@typescript-eslint/parser": "5.27.0",
+    "@typescript-eslint/eslint-plugin": "5.36.2",
+    "@typescript-eslint/parser": "5.36.2",
     "class-transformer": "0.5.1",
     "class-validator": "0.13.2",
-    "eslint": "8.16.0",
+    "eslint": "8.23.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-prettier": "4.2.1",
     "graphql": "15.8.0",
     "graphql-subscriptions": "2.0.0",
     "husky": "8.0.1",
-    "jest": "28.1.0",
-    "lerna": "5.0.0",
+    "jest": "29.0.2",
+    "lerna": "5.5.0",
     "lerna-changelog": "2.2.0",
-    "lint-staged": "12.4.3",
-    "prettier": "2.6.2",
+    "lint-staged": "13.0.3",
+    "prettier": "2.7.1",
     "reflect-metadata": "0.1.13",
-    "release-it": "15.0.0",
+    "release-it": "15.4.1",
     "rimraf": "3.0.2",
-    "rxjs": "7.5.5",
-    "supertest": "6.2.3",
-    "ts-jest": "28.0.3",
-    "ts-node": "10.8.0",
-    "typescript": "4.7.2"
+    "rxjs": "7.5.6",
+    "supertest": "6.2.4",
+    "ts-jest": "28.0.8",
+    "ts-node": "10.9.1",
+    "typescript": "4.8.2"
   },
   "changelog": {
     "labels": {

packages/apollo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/apollo",
-  "version": "10.0.13",
+  "version": "10.1.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@apollo)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -15,26 +15,30 @@
     "url": "git+https://github.com/nestjs/graphql.git"
   },
   "scripts": {
-    "test:e2e": "jest --config ./tests/jest-e2e.ts --runInBand",
+    "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:dev": "jest --config ./tests/jest-e2e.ts --runInBand --watch"
   },
   "bugs": {
     "url": "https://github.com/nestjs/graphql/issues"
   },
   "devDependencies": {
-    "@apollo/gateway": "0.51.0",
-    "@nestjs/common": "8.4.5",
-    "@nestjs/core": "8.4.5",
-    "@nestjs/platform-express": "8.4.5",
-    "@nestjs/platform-fastify": "8.4.5",
-    "@nestjs/testing": "8.4.5",
+    "@apollo/gateway": "0.52.1",
+    "@apollo/gateway-v2": "npm:@apollo/[email protected]",
+    "@apollo/subgraph-v2": "npm:@apollo/[email protected]",
+    "@nestjs/common": "8.4.7",
+    "@nestjs/core": "8.4.7",
+    "@nestjs/platform-express": "8.4.7",
+    "@nestjs/platform-fastify": "8.4.7",
+    "@nestjs/testing": "8.4.7",
     "apollo-cache-inmemory": "1.6.6",
     "apollo-client": "2.6.10",
     "apollo-link-ws": "1.0.20",
-    "apollo-server-core": "3.8.1",
-    "apollo-server-express": "3.8.1",
-    "apollo-server-fastify": "3.8.1",
-    "apollo-server-plugin-response-cache": "3.6.0"
+    "apollo-server-core": "3.10.2",
+    "apollo-server-express": "3.10.2",
+    "apollo-server-fastify": "3.10.2",
+    "apollo-server-plugin-response-cache": "3.7.0",
+    "graphql-16": "npm:[email protected]"
   },
   "dependencies": {
     "iterall": "1.3.0",
@@ -43,12 +47,13 @@
   },
   "peerDependencies": {
     "@apollo/gateway": "^0.44.1 || ^0.46.0 || ^0.48.0 || ^0.49.0 || ^0.50.0 || ^2.0.0",
-    "@nestjs/common": "^8.2.3",
-    "@nestjs/core": "^8.2.3",
+    "@nestjs/common": "^8.2.3 || ^9.0.0",
+    "@nestjs/core": "^8.2.3 || ^9.0.0",
     "@nestjs/graphql": "^10.0.0",
     "apollo-server-core": "^3.5.0",
     "apollo-server-express": "^3.5.0",
-    "apollo-server-fastify": "^3.5.0"
+    "apollo-server-fastify": "^3.5.0",
+    "graphql": "^15.8.0 || ^16.0.0"
   },
   "peerDependenciesMeta": {
     "@apollo/gateway": {

packages/apollo/tests/code-first-graphql-federation2/gateway/gateway.module.ts

@@ -0,0 +1,22 @@
+import { IntrospectAndCompose } from '@apollo/gateway-v2';
+import { Module } from '@nestjs/common';
+import { GraphQLModule } from '@nestjs/graphql';
+import { ApolloGatewayDriver, ApolloGatewayDriverConfig } from '../../../lib';
+
+@Module({
+  imports: [
+    GraphQLModule.forRoot<ApolloGatewayDriverConfig>({
+      driver: ApolloGatewayDriver,
+      gateway: {
+        debug: false,
+        supergraphSdl: new IntrospectAndCompose({
+          subgraphs: [
+            { name: 'users', url: 'http://localhost:3001/graphql' },
+            { name: 'posts', url: 'http://localhost:3002/graphql' },
+          ],
+        }),
+      },
+    }),
+  ],
+})
+export class AppModule {}

packages/apollo/tests/code-first-graphql-federation2/posts-service/federation-posts.module.ts

@@ -0,0 +1,24 @@
+import { Module } from '@nestjs/common';
+import { GraphQLModule } from '@nestjs/graphql';
+import { ApolloServerPluginInlineTraceDisabled } from 'apollo-server-core';
+import { ApolloDriverConfig } from '../../../lib';
+import { ApolloFederationDriver } from '../../../lib/drivers';
+import { PostsModule } from './posts/posts.module';
+import { User } from './posts/user.entity';
+
+@Module({
+  imports: [
+    GraphQLModule.forRoot<ApolloDriverConfig>({
+      driver: ApolloFederationDriver,
+      autoSchemaFile: {
+        federation: 2,
+      },
+      buildSchemaOptions: {
+        orphanedTypes: [User],
+      },
+      plugins: [ApolloServerPluginInlineTraceDisabled()],
+    }),
+    PostsModule,
+  ],
+})
+export class AppModule {}

packages/apollo/tests/code-first-graphql-federation2/posts-service/posts/post-type.enum.ts

@@ -0,0 +1,10 @@
+import { registerEnumType } from '@nestjs/graphql';
+
+export enum PostType {
+  IMAGE = 'IMAGE',
+  TEXT = 'TEXT',
+}
+
+registerEnumType(PostType, {
+  name: 'PostType',
+});