From d7c1fbb28d39337daebce6c51823fd03f1f95adf Mon Sep 17 00:00:00 2001 From: josefaidt Date: Fri, 10 Nov 2023 11:50:30 -0800 Subject: [PATCH 1/2] fix prettier phantom dep, add dependency, bump types --- packages/graphql-generator/package.json | 5 +++-- yarn.lock | 14 +++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/graphql-generator/package.json b/packages/graphql-generator/package.json index 9b104c722..bd8a59db1 100644 --- a/packages/graphql-generator/package.json +++ b/packages/graphql-generator/package.json @@ -29,10 +29,11 @@ "@aws-amplify/graphql-types-generator": "3.4.5", "@graphql-codegen/core": "^2.6.6", "@graphql-tools/apollo-engine-loader": "^8.0.0", - "graphql": "^15.5.0" + "graphql": "^15.5.0", + "prettier": "^3.0.3" }, "devDependencies": { - "@types/prettier": "^1.0.0" + "@types/prettier": "^3.0.0" }, "typescript": { "definition": "lib/index.d.ts" diff --git a/yarn.lock b/yarn.lock index d04c42431..2e40a325c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5725,7 +5725,7 @@ resolved "https://registry.npmjs.org/@types/pluralize/-/pluralize-0.0.29.tgz#6ffa33ed1fc8813c469b859681d09707eb40d03c" integrity sha512-BYOID+l2Aco2nBik+iYS4SZX0Lf20KPILP5RGmM1IgzdwNdTs0eebiFriOPcej1sX9mLnSoiNte5zcFxssgpGA== -"@types/prettier@^1.0.0", "@types/prettier@^1.19.0": +"@types/prettier@^1.19.0": version "1.19.1" resolved "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" integrity sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ== @@ -5735,6 +5735,13 @@ resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== +"@types/prettier@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-3.0.0.tgz#e9bc8160230d3a461dab5c5b41cceef1ef723057" + integrity sha512-mFMBfMOz8QxhYVbuINtswBp9VL2b4Y0QqYHwqLz3YbgtfAcat2Dl6Y1o4e22S/OVE6Ebl9m7wWiMT2lSbAs1wA== + dependencies: + prettier "*" + "@types/rimraf@^3.0.0": version "3.0.2" resolved "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8" @@ -12658,6 +12665,11 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" +prettier@*, prettier@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" + integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== + prettier@^1.19.1, prettier@^1.7.0: version "1.19.1" resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" From e199281e88414795f92cfabe19fd043245a333cf Mon Sep 17 00:00:00 2001 From: josefaidt Date: Fri, 10 Nov 2023 13:23:41 -0800 Subject: [PATCH 2/2] downgrade prettier version to match root --- packages/graphql-generator/package.json | 4 ++-- yarn.lock | 14 +------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/packages/graphql-generator/package.json b/packages/graphql-generator/package.json index bd8a59db1..393073960 100644 --- a/packages/graphql-generator/package.json +++ b/packages/graphql-generator/package.json @@ -30,10 +30,10 @@ "@graphql-codegen/core": "^2.6.6", "@graphql-tools/apollo-engine-loader": "^8.0.0", "graphql": "^15.5.0", - "prettier": "^3.0.3" + "prettier": "^1.19.1" }, "devDependencies": { - "@types/prettier": "^3.0.0" + "@types/prettier": "^1.19.1" }, "typescript": { "definition": "lib/index.d.ts" diff --git a/yarn.lock b/yarn.lock index 2e40a325c..0e39a4291 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5725,7 +5725,7 @@ resolved "https://registry.npmjs.org/@types/pluralize/-/pluralize-0.0.29.tgz#6ffa33ed1fc8813c469b859681d09707eb40d03c" integrity sha512-BYOID+l2Aco2nBik+iYS4SZX0Lf20KPILP5RGmM1IgzdwNdTs0eebiFriOPcej1sX9mLnSoiNte5zcFxssgpGA== -"@types/prettier@^1.19.0": +"@types/prettier@^1.19.0", "@types/prettier@^1.19.1": version "1.19.1" resolved "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" integrity sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ== @@ -5735,13 +5735,6 @@ resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== -"@types/prettier@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-3.0.0.tgz#e9bc8160230d3a461dab5c5b41cceef1ef723057" - integrity sha512-mFMBfMOz8QxhYVbuINtswBp9VL2b4Y0QqYHwqLz3YbgtfAcat2Dl6Y1o4e22S/OVE6Ebl9m7wWiMT2lSbAs1wA== - dependencies: - prettier "*" - "@types/rimraf@^3.0.0": version "3.0.2" resolved "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8" @@ -12665,11 +12658,6 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@*, prettier@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" - integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== - prettier@^1.19.1, prettier@^1.7.0: version "1.19.1" resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"