diff --git a/package.json b/package.json index 2cbfd5c8f..f75f6c666 100644 --- a/package.json +++ b/package.json @@ -52,12 +52,10 @@ "resolutions": { "pg": "^8.16.0", "@types/pg": "^8.15.2", - "graphql": "15.5.2" - }, - "overrides": { "graphql": "15.5.2", + "**/graphql": "15.5.2", "graphql-upload": "^13.0.0", - "@pyramation/postgis": "0.1.1" + "@types/graphql-upload": "^15.0.2" }, "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 7817093f2..a9b4aa65c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -56,9 +56,6 @@ "pg-env": "^1.1.0", "shelljs": "^0.9.2" }, - "resolutions": { - "graphql": "15.5.2" - }, "keywords": [ "cli", "command-line", diff --git a/packages/explorer/package.json b/packages/explorer/package.json index 513eba18f..0dd220983 100644 --- a/packages/explorer/package.json +++ b/packages/explorer/package.json @@ -45,6 +45,7 @@ "graphile-build": "^4.14.1", "graphile-cache": "^1.1.1", "graphile-settings": "^2.3.1", + "graphql": "15.5.2", "graphql-upload": "^13.0.0", "pg-cache": "^1.1.1", "postgraphile": "^4.14.1" @@ -62,8 +63,5 @@ "ui", "launchql", "interface" - ], - "resolutions": { - "graphql": "15.5.2" - } + ] } diff --git a/packages/gql-ast/package.json b/packages/gql-ast/package.json index f77047e9f..b1f1c8599 100644 --- a/packages/gql-ast/package.json +++ b/packages/gql-ast/package.json @@ -29,8 +29,8 @@ "test": "jest", "test:watch": "jest --watch" }, - "dependencies": { - "graphql": "15.5.2" + "peerDependencies": { + "graphql": "^15.5.0" }, "keywords": [ "graphql", diff --git a/packages/graphile-query/package.json b/packages/graphile-query/package.json index 18b61d833..ca5349694 100644 --- a/packages/graphile-query/package.json +++ b/packages/graphile-query/package.json @@ -30,12 +30,11 @@ "test:watch": "jest --watch" }, "dependencies": { - "graphql": "15.5.2", "pg": "^8.16.0", "postgraphile": "^4.14.1" }, - "resolutions": { - "graphql": "15.5.2" + "peerDependencies": { + "graphql": "^15.5.0" }, "keywords": [ "graphql", diff --git a/packages/graphile-settings/package.json b/packages/graphile-settings/package.json index 00b013ecf..a79ed53ea 100644 --- a/packages/graphile-settings/package.json +++ b/packages/graphile-settings/package.json @@ -64,9 +64,6 @@ "nodemon": "^3.1.10", "ts-node": "^10.9.2" }, - "resolutions": { - "graphql": "15.5.2" - }, "keywords": [ "graphile", "settings", diff --git a/packages/graphile-test/package.json b/packages/graphile-test/package.json index 3079cd89c..bb0bfc149 100644 --- a/packages/graphile-test/package.json +++ b/packages/graphile-test/package.json @@ -36,13 +36,12 @@ "dependencies": { "@launchql/types": "^2.3.0", "graphile-settings": "^2.3.1", - "graphql": "15.5.2", "mock-req": "^0.2.0", "pg": "^8.16.0", "postgraphile": "^4.14.1" }, - "resolutions": { - "graphql": "15.5.2" + "peerDependencies": { + "graphql": "^15.5.0" }, "keywords": [ "testing", diff --git a/packages/query/package.json b/packages/query/package.json index 1fcd34f44..d9de46d24 100644 --- a/packages/query/package.json +++ b/packages/query/package.json @@ -32,12 +32,11 @@ "dependencies": { "ajv": "^7.0.4", "gql-ast": "^2.2.0", - "graphql": "15.5.2", "inflection": "1.12.0", "pluralize": "8.0.0" }, - "resolutions": { - "graphql": "15.5.2" + "peerDependencies": { + "graphql": "^15.5.0" }, "keywords": [ "query", diff --git a/packages/server/package.json b/packages/server/package.json index 87d8e1650..2f14dfd5d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -57,6 +57,7 @@ "graphile-search-plugin": "^0.1.2", "graphile-settings": "^2.3.1", "graphile-simple-inflector": "^0.1.1", + "graphql": "15.5.2", "graphql-tag": "2.12.6", "graphql-upload": "^13.0.0", "lru-cache": "^11.1.0", @@ -77,8 +78,5 @@ "@types/rimraf": "^4.0.5", "nodemon": "^3.1.10", "ts-node": "^10.9.2" - }, - "resolutions": { - "graphql": "15.5.2" } } diff --git a/packages/types/package.json b/packages/types/package.json index 391745a06..57e8c793e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -35,9 +35,6 @@ "pg-env": "^1.1.0", "postgraphile": "^4.14.1" }, - "resolutions": { - "graphql": "15.5.2" - }, "keywords": [ "graphql", "types", diff --git a/yarn.lock b/yarn.lock index 5080e9e2b..7d7a8a8f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5074,7 +5074,7 @@ fresh@^2.0.0: resolved "https://registry.yarnpkg.com/fresh/-/fresh-2.0.0.tgz#8dd7df6a1b3a1b3a5cf186c05a5dd267622635a4" integrity sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A== -fs-capacitor@^6.1.0, fs-capacitor@^6.2.0: +fs-capacitor@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-6.2.0.tgz#fa79ac6576629163cb84561995602d8999afb7f5" integrity sha512-nKcE1UduoSKX27NSZlg879LdQc94OtbOsEmKMN2MBNudXREvijRKx2GEBsTMTfws+BrbkJoEuynbGSVRSpauvw== @@ -5506,18 +5506,7 @@ graphql-tag@2.12.6: dependencies: tslib "^2.1.0" -graphql-upload@11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/graphql-upload/-/graphql-upload-11.0.0.tgz#24b245ff18f353bab6715e8a055db9fd73035e10" - integrity sha512-zsrDtu5gCbQFDWsNa5bMB4nf1LpKX9KDgh+f8oL1288ijV4RxeckhVozAjqjXAfRpxOHD1xOESsh6zq8SjdgjA== - dependencies: - busboy "^0.3.1" - fs-capacitor "^6.1.0" - http-errors "^1.7.3" - isobject "^4.0.0" - object-path "^0.11.4" - -graphql-upload@^13.0.0: +graphql-upload@11.0.0, graphql-upload@^13.0.0: version "13.0.0" resolved "https://registry.yarnpkg.com/graphql-upload/-/graphql-upload-13.0.0.tgz#1a255b64d3cbf3c9f9171fa62a8fb0b9b59bb1d9" integrity sha512-YKhx8m/uOtKu4Y1UzBFJhbBGJTlk7k4CydlUUiNrtxnwZv0WigbRHP+DVhRNKt7u7DXOtcKZeYJlGtnMXvreXA== @@ -5649,7 +5638,7 @@ http-errors@2.0.0, http-errors@^2.0.0: statuses "2.0.1" toidentifier "1.0.1" -http-errors@^1.5.1, http-errors@^1.7.3, http-errors@^1.8.1: +http-errors@^1.5.1, http-errors@^1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== @@ -6102,11 +6091,6 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== -isobject@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0" - integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA== - istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756" @@ -7879,7 +7863,7 @@ object-inspect@^1.13.3: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213" integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew== -object-path@^0.11.4, object-path@^0.11.8: +object-path@^0.11.8: version "0.11.8" resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.8.tgz#ed002c02bbdd0070b78a27455e8ae01fc14d4742" integrity sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==