chore: resolve conflicts

Author: kamilmysliwiec

package.json

@@ -29,33 +29,33 @@
     "graphql": "16.6.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.4.2",
-    "@commitlint/config-angular": "17.4.2",
+    "@commitlint/cli": "17.4.4",
+    "@commitlint/config-angular": "17.4.4",
     "@types/graphql": "14.5.0",
     "@types/jest": "29.4.0",
-    "@types/node": "18.11.19",
+    "@types/node": "18.15.0",
     "@types/node-fetch": "3.0.3",
     "@types/normalize-path": "3.0.0",
     "@types/ws": "8.5.4",
-    "@typescript-eslint/eslint-plugin": "5.51.0",
-    "@typescript-eslint/parser": "5.51.0",
+    "@typescript-eslint/eslint-plugin": "5.54.1",
+    "@typescript-eslint/parser": "5.54.1",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.0",
-    "eslint": "8.33.0",
-    "eslint-config-prettier": "8.6.0",
+    "eslint": "8.35.0",
+    "eslint-config-prettier": "8.7.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-prettier": "4.2.1",
     "graphql": "16.6.0",
     "graphql-subscriptions": "2.0.0",
     "husky": "8.0.3",
-    "jest": "29.4.1",
-    "lerna": "6.4.1",
+    "jest": "29.5.0",
+    "lerna": "6.5.1",
     "lerna-changelog": "2.2.0",
-    "lint-staged": "13.1.1",
-    "prettier": "2.8.3",
+    "lint-staged": "13.1.2",
+    "prettier": "2.8.4",
     "reflect-metadata": "0.1.13",
-    "release-it": "15.6.0",
-    "rimraf": "4.1.2",
+    "release-it": "15.8.0",
+    "rimraf": "4.4.0",
     "rxjs": "7.8.0",
     "supertest": "6.3.3",
     "ts-jest": "29.0.5",

packages/graphql/tests/plugin/decorators/field.decorator.spec.ts

@@ -39,3 +39,9 @@ class CorrectArray {
   @Field(() => [Inner], { defaultValue: [{ test: 'test' }] })
   inner: Inner;
 }
+
+describe('Field decorator (defaultValue)', () => {
+  it('TypeScript should not complain about the type mismatch', () => {
+    expect(true).toBeTruthy();
+  });
+});

packages/mercurius/package.json

@@ -32,7 +32,7 @@
     "@nestjs/common": "9.3.8",
     "@nestjs/platform-fastify": "9.3.8",
     "@nestjs/testing": "9.3.8",
-    "fastify": "4.12.0",
+    "fastify": "4.14.1",
     "mercurius": "12.0.0",
     "mercurius-integration-testing": "6.0.1"
   },