Merge branch 'master' into fix-resolvers-union-types

dotansimha · Mar 21, 2023 · d886ebf · d886ebf
2 parents ea2aff5 + 0f53581
commit d886ebf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/examples/programmatic-typescript/package.json b/examples/programmatic-typescript/package.json
@@ -21,7 +21,7 @@
     "@graphql-tools/schema": "9.0.17",
     "graphql": "16.6.0",
     "graphql-tag": "2.12.6",
-    "prettier": "2.8.4"
+    "prettier": "2.8.5"
   },
   "devDependencies": {
     "@types/node": "18.15.1",

diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "jest-junit": "15.0.0",
     "lint-staged": "13.2.0",
     "patch-package": "6.5.1",
-    "prettier": "2.8.4",
+    "prettier": "2.8.5",
     "prettier-plugin-svelte": "2.9.0",
     "rimraf": "4.4.0",
     "ts-jest": "28.0.8",
@@ -75,7 +75,7 @@
     ]
   },
   "resolutions": {
-    "prettier": "2.8.4",
+    "prettier": "2.8.5",
     "babel-jest": "28.1.3",
     "jest-runner": "28.1.3",
     "graphql": "16.6.0",

diff --git a/packages/graphql-codegen-cli/package.json b/packages/graphql-codegen-cli/package.json
@@ -89,7 +89,7 @@
     "change-case-all": "1.0.15",
     "js-yaml": "4.1.0",
     "make-dir": "3.1.0",
-    "prettier": "2.8.4"
+    "prettier": "2.8.5"
   },
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"

diff --git a/yarn.lock b/yarn.lock
@@ -11884,10 +11884,10 @@ prettier-plugin-tailwindcss@0.2.4:
   resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.4.tgz#ed0ca759bc948eb2bc48b419c6e57eb2adabdb0a"
   integrity sha512-wMyugRI2yD8gqmMpZSS8kTA0gGeKozX/R+w8iWE+yiCZL09zY0SvfiHfHabNhjGhzxlQ2S2VuTxPE3T72vppCQ==
 
-prettier@2.8.4, prettier@^2.7.1:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3"
-  integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==
+prettier@2.8.5, prettier@^2.7.1:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.5.tgz#3dd8ae1ebddc4f6aa419c9b64d8c8319a7e0d982"
+  integrity sha512-3gzuxrHbKUePRBB4ZeU08VNkUcqEHaUaouNt0m7LGP4Hti/NuB07C7PPTM/LkWqXoJYJn2McEo5+kxPNrtQkLQ==
 
 pretty-bytes@^5.6.0:
   version "5.6.0"