From 9e84eb0fa843316cc4a7d744365bff34521c7bd4 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Fri, 18 Sep 2020 07:57:29 +0200 Subject: [PATCH] fix: Fix dependencies configuration issues with typeorm, graphql --- docs/tutorials/graphql.md | 4 +- examples/multer/package.json | 1 + packages/graphql/package.json | 11 +++-- packages/graphql/readme.md | 4 +- packages/typeorm/package.json | 10 ++-- yarn.lock | 86 ++++++++++++++++++++++++++++++++++- 6 files changed, 106 insertions(+), 10 deletions(-) diff --git a/docs/tutorials/graphql.md b/docs/tutorials/graphql.md index 20d264e4856..15c6b1d615a 100644 --- a/docs/tutorials/graphql.md +++ b/docs/tutorials/graphql.md @@ -21,7 +21,9 @@ as decorator library. To begin, install the GraphQL module for TS.ED, graphql and apollo-server-testing: ```bash -npm install --save @tsed/graphql graphql@14.7.0 apollo-server-testing +npm install --save @tsed/graphql type-graphql graphql@14.7.0 +npm install --save apollo-datasource apollo-datasource-rest apollo-server-express +npm install --save-dev apollo-server-testing ``` [Type-graphql](https://19majkel94.github.io/type-graphql/) requires to update your `tsconfig.json` by adding extra options as following: diff --git a/examples/multer/package.json b/examples/multer/package.json index ffd94c10bdc..390fd2a7b8f 100644 --- a/examples/multer/package.json +++ b/examples/multer/package.json @@ -54,6 +54,7 @@ "@types/sinon": "9.0.4", "@types/sinon-chai": "3.2.4", "@types/supertest": "2.0.10", + "@types/multer": "1.4.4", "chai": "4.2.0", "chai-as-promised": "7.1.1", "concurrently": "5.2.0", diff --git a/packages/graphql/package.json b/packages/graphql/package.json index d40ff6f5df0..060a247f349 100644 --- a/packages/graphql/package.json +++ b/packages/graphql/package.json @@ -9,8 +9,8 @@ }, "dependencies": { "apollo-datasource": "^0.7.2", - "apollo-datasource-rest": "0.9.3", - "apollo-server-express": "2.16.1", + "apollo-datasource-rest": "^0.9.3", + "apollo-server-express": "^2.16.1", "tslib": "1.11.0", "type-graphql": "^0.17.6" }, @@ -22,5 +22,10 @@ "apollo-server-testing": "2.16.1", "graphql": "14.7.0" }, - "peerDependencies": {} + "peerDependencies": { + "apollo-datasource": "^0.7.2", + "apollo-datasource-rest": "^0.9.3", + "apollo-server-express": "^2.16.1", + "type-graphql": "^0.17.6" + } } \ No newline at end of file diff --git a/packages/graphql/readme.md b/packages/graphql/readme.md index 1c4ae6c82ac..ee35a63f0e7 100644 --- a/packages/graphql/readme.md +++ b/packages/graphql/readme.md @@ -20,7 +20,9 @@ for the decorators. To begin, install the GraphQL module for TS.ED: ```bash -npm install --save @tsed/graphql +npm install --save @tsed/graphql type-graphql graphql@14.7.0 +npm install --save apollo-datasource apollo-datasource-rest apollo-server-express +npm install --save-dev apollo-server-testing ``` [Type-graphql](https://19majkel94.github.io/type-graphql/) require to update your `tsconfig.json` by adding extra options as following: diff --git a/packages/typeorm/package.json b/packages/typeorm/package.json index f421f4be341..305f5f4a5e6 100644 --- a/packages/typeorm/package.json +++ b/packages/typeorm/package.json @@ -8,13 +8,15 @@ "build": "tsc --build tsconfig.compile.json" }, "dependencies": { - "tslib": "1.11.0", - "typeorm": "0.2.25" + "tslib": "1.11.0" }, "private": false, "devDependencies": { "@tsed/common": "5.65.2", - "@tsed/core": "5.65.2" + "@tsed/core": "5.65.2", + "typeorm": "^0.2.26" }, - "peerDependencies": {} + "peerDependencies": { + "typeorm": "^0.2.26" + } } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 00ec61028d8..3c198e53310 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3509,7 +3509,7 @@ apollo-cache-control@^0.11.1: apollo-server-env "^2.4.5" apollo-server-plugin-base "^0.9.1" -apollo-datasource-rest@0.9.3: +apollo-datasource-rest@^0.9.3: version "0.9.3" resolved "https://registry.yarnpkg.com/apollo-datasource-rest/-/apollo-datasource-rest-0.9.3.tgz#3d7d0326d2848a14e52621e2ccdab567363a4bc3" integrity sha512-DqSmcziPpSSz79zS+bmixFhlf5fVDKbAKqU5Hqd77jRjrrzpYN0pgT7NJTd4IhC1jVLTE+/9bZ6Q7Cr8fcID/A== @@ -3613,6 +3613,34 @@ apollo-server-core@^2.16.1: subscriptions-transport-ws "^0.9.11" ws "^6.0.0" +apollo-server-core@^2.17.0: + version "2.17.0" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.17.0.tgz#6af697ffe4968e74add01cd1efd2a8fb33299cf3" + integrity sha512-rjAkBbKSrGLDfg/g5bohnPlQahmkAxgEBuMDVsoF3aa+RaEPXPUMYrLbOxntl0LWeLbPiMa/IyFF43dvlGqV7w== + dependencies: + "@apollographql/apollo-tools" "^0.4.3" + "@apollographql/graphql-playground-html" "1.6.26" + "@types/graphql-upload" "^8.0.0" + "@types/ws" "^7.0.0" + apollo-cache-control "^0.11.1" + apollo-datasource "^0.7.2" + apollo-engine-reporting "^2.3.0" + apollo-server-caching "^0.5.2" + apollo-server-env "^2.4.5" + apollo-server-errors "^2.4.2" + apollo-server-plugin-base "^0.9.1" + apollo-server-types "^0.5.1" + apollo-tracing "^0.11.2" + fast-json-stable-stringify "^2.0.0" + graphql-extensions "^0.12.4" + graphql-tag "^2.9.2" + graphql-tools "^4.0.0" + graphql-upload "^8.0.2" + loglevel "^1.6.7" + sha.js "^2.4.11" + subscriptions-transport-ws "^0.9.11" + ws "^6.0.0" + apollo-server-env@^2.4.5: version "2.4.5" resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.5.tgz#73730b4f0439094a2272a9d0caa4079d4b661d5f" @@ -3648,6 +3676,28 @@ apollo-server-express@2.16.1: subscriptions-transport-ws "^0.9.16" type-is "^1.6.16" +apollo-server-express@^2.16.1: + version "2.17.0" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.17.0.tgz#2014559b75a0bcf7ff8cf0f2d077da6653abbc18" + integrity sha512-PonpWOuM1DH3Cz0bu56Tusr3GXOnectC6AD/gy2GXK0v84E7tKTuxEY3SgsgxhvfvvhfwJbXTyIogL/wezqnCw== + dependencies: + "@apollographql/graphql-playground-html" "1.6.26" + "@types/accepts" "^1.3.5" + "@types/body-parser" "1.19.0" + "@types/cors" "^2.8.4" + "@types/express" "4.17.7" + accepts "^1.3.5" + apollo-server-core "^2.17.0" + apollo-server-types "^0.5.1" + body-parser "^1.18.3" + cors "^2.8.4" + express "^4.17.1" + graphql-subscriptions "^1.0.0" + graphql-tools "^4.0.0" + parseurl "^1.3.2" + subscriptions-transport-ws "^0.9.16" + type-is "^1.6.16" + apollo-server-plugin-base@^0.9.1: version "0.9.1" resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.1.tgz#a62ae9ab4e89790fd4cc5d123bb616da34e8e5fb" @@ -3679,6 +3729,14 @@ apollo-tracing@^0.11.1: apollo-server-env "^2.4.5" apollo-server-plugin-base "^0.9.1" +apollo-tracing@^0.11.2: + version "0.11.2" + resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.11.2.tgz#14308b176e021f5e6ec3ee670f8f96e9fbfdb50c" + integrity sha512-QjmRd2ozGD+PfmF6U9w/w6jrclYSBNczN6Bzppr8qA5somEGl5pqdprIZYL28H0IapZiutA3x6p6ZVF/cVX8wA== + dependencies: + apollo-server-env "^2.4.5" + apollo-server-plugin-base "^0.9.1" + apollo-utilities@^1.0.1, apollo-utilities@^1.3.0: version "1.3.4" resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.4.tgz#6129e438e8be201b6c55b0f13ce49d2c7175c9cf" @@ -6295,6 +6353,11 @@ dotenv@^6.2.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w== +dotenv@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" + integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== + duplexer2@~0.1.0: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" @@ -15237,6 +15300,27 @@ typeorm@0.2.25: yargonaut "^1.1.2" yargs "^13.2.1" +typeorm@^0.2.26: + version "0.2.26" + resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.26.tgz#1027afa13f89ab98bc3d07675fe7268bbefa55a7" + integrity sha512-sbKxK6K9sXZPCVF0weEb74UA/z1UW0sRWfI7EoOOtQaRZaLvSEwtgHPqle9t8asxEtD+gzkUdd+NqF7yH7HtIQ== + dependencies: + app-root-path "^3.0.0" + buffer "^5.1.0" + chalk "^2.4.2" + cli-highlight "^2.0.0" + debug "^4.1.1" + dotenv "^8.2.0" + glob "^7.1.2" + js-yaml "^3.13.1" + mkdirp "^1.0.3" + reflect-metadata "^0.1.13" + sha.js "^2.4.11" + tslib "^1.9.0" + xml2js "^0.4.17" + yargonaut "^1.1.2" + yargs "^13.2.1" + typescript@3.9.4: version "3.9.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.4.tgz#5aa0a54904b51b96dfd67870ce2db70251802f10"