Skip to content

Commit 4b034af

Browse files
committed
Merge remote-tracking branch 'Nest/master' into 2361-kafka-microservice
# Conflicts: # integration/microservices/package-lock.json # package.json
2 parents 110a34b + 0ba0811 commit 4b034af

80 files changed

Lines changed: 2681 additions & 2314 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
7272
<a href="https://reposit.co.uk/" target="_blank"><img src="https://nestjs.com/img/reposit-logo.png" height="28" valign="middle" /></a> &nbsp; &nbsp; <a href="https://yakaz.com/" target="_blank"><img src="https://nestjs.com/img/yakaz.png" width="80" valign="middle" /></a> &nbsp;
7373
<a href="https://nearpod.com/" target="_blank"><img src="https://nestjs.com/img/nearpod-logo.svg" width="120" valign="middle" /></a> &nbsp;
7474
<a href="https://clay.global/" target="_blank"><img src="https://nestjs.com/img/clay-logo.svg" width="90" valign="middle" /></a> &nbsp;
75+
<a href="https://firesticktricks.com" target="_blank"><img src="https://nestjs.com/img/firesticktricks-logo.png" width="145" valign="middle" /></a> &nbsp;
7576
<a href="http://xtremis.com/" target="_blank"><img src="https://nestjs.com/img/logo-xtremis.svg" width="145" valign="middle" /></a>
7677

7778

integration/graphql/package-lock.json

Lines changed: 174 additions & 147 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/graphql/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
"start:prod": "node dist/main.js"
1010
},
1111
"dependencies": {
12-
"@nestjs/common": "6.3.1",
13-
"@nestjs/core": "6.3.1",
12+
"@nestjs/common": "6.3.2",
13+
"@nestjs/core": "6.3.2",
1414
"@nestjs/graphql": "6.2.4",
15-
"apollo-server-express": "2.6.1",
15+
"apollo-server-express": "2.6.4",
1616
"graphql": "14.3.1",
17-
"graphql-tools": "4.0.4",
17+
"graphql-tools": "4.0.5",
1818
"reflect-metadata": "0.1.13",
1919
"rxjs": "6.5.2",
2020
"subscriptions-transport-ws": "0.9.16",
21-
"typescript": "3.5.1",
22-
"ws": "7.0.0"
21+
"typescript": "3.5.2",
22+
"ws": "7.0.1"
2323
},
2424
"devDependencies": {
2525
"@types/node": "7.10.6",
26-
"ts-node": "8.2.0",
27-
"tslint": "5.17.0"
26+
"ts-node": "8.3.0",
27+
"tslint": "5.18.0"
2828
}
2929
}

integration/hello-world/package-lock.json

Lines changed: 63 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/hello-world/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
"start": "ts-node src/main"
88
},
99
"dependencies": {
10-
"@nestjs/common": "6.3.1",
11-
"@nestjs/core": "6.3.1",
12-
"@nestjs/microservices": "6.3.1",
13-
"@nestjs/testing": "6.3.1",
14-
"@nestjs/websockets": "6.3.1",
10+
"@nestjs/common": "6.3.2",
11+
"@nestjs/core": "6.3.2",
12+
"@nestjs/microservices": "6.3.2",
13+
"@nestjs/testing": "6.3.2",
14+
"@nestjs/websockets": "6.3.2",
1515
"class-transformer": "0.2.3",
1616
"class-validator": "0.9.1",
17-
"fastify": "2.4.1",
17+
"fastify": "2.5.0",
1818
"reflect-metadata": "0.1.13",
1919
"rxjs": "6.5.2",
20-
"typescript": "3.5.1"
20+
"typescript": "3.5.2"
2121
},
2222
"devDependencies": {
2323
"@types/node": "7.10.6",
2424
"supertest": "4.0.2",
25-
"ts-node": "8.2.0"
25+
"ts-node": "8.3.0"
2626
}
2727
}

0 commit comments

Comments
 (0)