Skip to content

Commit

Permalink
Merge branch 'master' into 6.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed May 30, 2019
2 parents 651b464 + 31525df commit 9b7eec3
Show file tree
Hide file tree
Showing 57 changed files with 588 additions and 445 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -320,7 +320,7 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
[corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
[dev-doc]: https://github.com/nestjs/nest/blob/master/docs/DEVELOPER.md
[github]: https://github.com/nestjs/nest
[gitter]: https://gitter.im/nestjs/nest
[gitter]: https://gitter.im/nestjs/nestjs
[individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
[js-style-guide]: https://google.github.io/styleguide/jsguide.html
[jsfiddle]: http://jsfiddle.net
Expand Down
33 changes: 23 additions & 10 deletions integration/graphql/package-lock.json

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

6 changes: 3 additions & 3 deletions integration/graphql/package.json
Expand Up @@ -13,17 +13,17 @@
"@nestjs/core": "6.2.4",
"@nestjs/graphql": "6.2.1",
"apollo-server-express": "2.5.0",
"graphql": "14.3.0",
"graphql": "14.3.1",
"graphql-tools": "4.0.4",
"reflect-metadata": "0.1.13",
"rxjs": "6.5.2",
"subscriptions-transport-ws": "0.9.16",
"typescript": "3.4.5",
"typescript": "3.5.1",
"ws": "7.0.0"
},
"devDependencies": {
"@types/node": "7.10.6",
"ts-node": "8.1.0",
"ts-node": "8.2.0",
"tslint": "5.16.0"
}
}
20 changes: 10 additions & 10 deletions integration/hello-world/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/hello-world/package.json
Expand Up @@ -17,11 +17,11 @@
"fastify": "2.4.1",
"reflect-metadata": "0.1.13",
"rxjs": "6.5.2",
"typescript": "3.4.5"
"typescript": "3.5.1"
},
"devDependencies": {
"@types/node": "7.10.6",
"supertest": "4.0.2",
"ts-node": "8.1.0"
"ts-node": "8.2.0"
}
}
20 changes: 10 additions & 10 deletions integration/hooks/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/hooks/package.json
Expand Up @@ -13,11 +13,11 @@
"class-validator": "0.9.1",
"reflect-metadata": "0.1.13",
"rxjs": "6.5.2",
"typescript": "3.4.5"
"typescript": "3.5.1"
},
"devDependencies": {
"@types/node": "7.10.6",
"supertest": "4.0.2",
"ts-node": "8.1.0"
"ts-node": "8.2.0"
}
}
20 changes: 10 additions & 10 deletions integration/injector/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/injector/package.json
Expand Up @@ -16,11 +16,11 @@
"class-validator": "0.9.1",
"reflect-metadata": "0.1.13",
"rxjs": "6.5.2",
"typescript": "3.4.5"
"typescript": "3.5.1"
},
"devDependencies": {
"@types/node": "7.10.6",
"supertest": "4.0.2",
"ts-node": "8.1.0"
"ts-node": "8.2.0"
}
}
20 changes: 10 additions & 10 deletions integration/microservices/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/microservices/package.json
Expand Up @@ -17,11 +17,11 @@
"class-validator": "0.9.1",
"reflect-metadata": "0.1.13",
"rxjs": "6.5.2",
"typescript": "3.4.5"
"typescript": "3.5.1"
},
"devDependencies": {
"@types/node": "7.10.6",
"supertest": "4.0.2",
"ts-node": "8.1.0"
"ts-node": "8.2.0"
}
}

0 comments on commit 9b7eec3

Please sign in to comment.