Skip to content

Commit

Permalink
Merge branch 'master' into renovate/typescript-3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec authored Mar 31, 2019
2 parents 12b11c3 + 62004c1 commit be093f3
Show file tree
Hide file tree
Showing 14 changed files with 97 additions and 79 deletions.
34 changes: 17 additions & 17 deletions integration/graphql/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions integration/graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"dependencies": {
"@nestjs/common": "6.0.4",
"@nestjs/core": "6.0.4",
"@nestjs/graphql": "6.0.3",
"@nestjs/graphql": "6.0.4",
"apollo-server-express": "2.4.8",
"graphql": "14.2.0",
"graphql": "14.2.1",
"graphql-tools": "4.0.4",
"reflect-metadata": "0.1.13",
"rxjs": "6.4.0",
Expand Down
34 changes: 17 additions & 17 deletions integration/typegraphql/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions integration/typegraphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"dependencies": {
"@nestjs/common": "6.0.4",
"@nestjs/core": "6.0.4",
"@nestjs/graphql": "6.0.3",
"@nestjs/graphql": "6.0.4",
"apollo-server-express": "2.4.8",
"class-transformer": "0.2.0",
"class-validator": "0.9.1",
"graphql": "14.2.0",
"graphql": "14.2.1",
"graphql-tools": "4.0.4",
"reflect-metadata": "0.1.13",
"rxjs": "6.4.0",
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"fastify-cors": "2.1.2",
"fastify-formbody": "3.1.0",
"fastify-multipart": "0.7.0",
"graphql": "14.2.0",
"graphql": "14.2.1",
"grpc": "1.19.0",
"http2": "3.3.7",
"iterare": "1.1.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/microservices/listeners-controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ export class ListenersController {
}
server.addHandler(
pattern,
data => {
async data => {
const contextId = createContextId();
const contextInstance = this.injector.loadPerContext(
const contextInstance = await this.injector.loadPerContext(
instance,
module,
collection,
Expand Down
2 changes: 1 addition & 1 deletion packages/platform-fastify/adapters/fastify-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export class FastifyAdapter extends AbstractHttpAdapter {
}

public enableCors(options: CorsOptions) {
this.register(cors, { options });
this.register(cors, options);
}

public registerParserMiddleware() {
Expand Down
4 changes: 2 additions & 2 deletions sample/07-sequelize/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"reflect-metadata": "0.1.13",
"rxjs": "6.4.0",
"sequelize": "5.2.8",
"sequelize-typescript": "0.6.8",
"sequelize-typescript": "0.6.9",
"typescript": "3.4.1"
},
"devDependencies": {
"@types/node": "10.14.4",
"@types/sequelize": "4.27.44",
"@types/sequelize": "4.27.46",
"ts-node": "8.0.3",
"tslint": "5.14.0"
}
Expand Down
4 changes: 2 additions & 2 deletions sample/12-graphql-apollo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"dependencies": {
"@nestjs/common": "6.0.4",
"@nestjs/core": "6.0.4",
"@nestjs/graphql": "6.0.3",
"@nestjs/graphql": "6.0.4",
"@nestjs/platform-express": "6.0.4",
"apollo-server-express": "2.4.8",
"class-transformer": "0.2.0",
"class-validator": "0.9.1",
"graphql": "14.2.0",
"graphql": "14.2.1",
"graphql-subscriptions": "1.0.0",
"reflect-metadata": "0.1.13",
"rxjs": "6.4.0",
Expand Down
4 changes: 2 additions & 2 deletions sample/22-graphql-prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"dependencies": {
"@nestjs/common": "6.0.4",
"@nestjs/core": "6.0.4",
"@nestjs/graphql": "6.0.3",
"@nestjs/graphql": "6.0.4",
"@nestjs/platform-express": "6.0.4",
"apollo-server-express": "2.4.8",
"graphql": "14.2.0",
"graphql": "14.2.1",
"graphql-tools": "4.0.4",
"prisma-binding": "2.3.10",
"reflect-metadata": "0.1.13",
Expand Down
36 changes: 27 additions & 9 deletions sample/22-graphql-prisma/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
optional "0.1.4"
uuid "3.3.2"

"@nestjs/[email protected].3":
version "6.0.3"
resolved "https://registry.yarnpkg.com/@nestjs/graphql/-/graphql-6.0.3.tgz#0c3bc2b9f26398a080e2aea6353024dbdc94b3c1"
"@nestjs/[email protected].4":
version "6.0.4"
resolved "https://registry.yarnpkg.com/@nestjs/graphql/-/graphql-6.0.4.tgz#dc5d381c293cbe61ea539c81d73d585277076bae"
dependencies:
"@types/graphql" "14.0.7"
chokidar "2.1.2"
chokidar "2.1.5"
fast-glob "2.2.6"
graphql-tools "4.0.4"
lodash "4.17.11"
Expand Down Expand Up @@ -680,7 +680,25 @@ chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1:
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"

[email protected], chokidar@^2.1.0:
[email protected]:
version "2.1.5"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
dependencies:
anymatch "^2.0.0"
async-each "^1.0.1"
braces "^2.3.2"
glob-parent "^3.1.0"
inherits "^2.0.3"
is-binary-path "^1.0.0"
is-glob "^4.0.0"
normalize-path "^3.0.0"
path-is-absolute "^1.0.0"
readdirp "^2.2.1"
upath "^1.1.1"
optionalDependencies:
fsevents "^1.2.7"

chokidar@^2.1.0:
version "2.1.2"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
dependencies:
Expand Down Expand Up @@ -1490,9 +1508,9 @@ graphql-upload@^8.0.2:
http-errors "^1.7.1"
object-path "^0.11.4"

[email protected].0:
version "14.2.0"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.0.tgz#ff25813ad6d186f3975977d56bc2d2434871f3b9"
[email protected].1:
version "14.2.1"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.1.tgz#779529bf9a01e7207b977a54c20670b48ca6e95c"
dependencies:
iterall "^1.2.2"

Expand Down Expand Up @@ -3206,7 +3224,7 @@ unzip-response@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"

upath@^1.1.0:
upath@^1.1.0, upath@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"

Expand Down
Loading

0 comments on commit be093f3

Please sign in to comment.