Skip to content

Commit

Permalink
Merge fix-typeorm-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@Romakita
Romakita committed Sep 18, 2020
2 parents 393ce9e + 9e84eb0 commit 3133232
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 10 deletions.
4 changes: 3 additions & 1 deletion docs/tutorials/graphql.md
View file
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions examples/multer/package.json
View file
Expand Up @@ -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",
Expand Down
11 changes: 8 additions & 3 deletions packages/graphql/package.json
View file
Expand Up @@ -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"
},
Expand All @@ -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"
}
}
4 changes: 3 additions & 1 deletion packages/graphql/readme.md
View file
Expand Up @@ -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:
Expand Down
10 changes: 6 additions & 4 deletions packages/typeorm/package.json
View file
Expand Up @@ -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"
}
}
86 changes: 85 additions & 1 deletion yarn.lock
View file
Expand Up @@ -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==
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 3133232

Please sign in to comment.