Skip to content

Commit 9832216

Browse files
resolve conflicts
2 parents 0686162 + 50083ce commit 9832216

47 files changed

Lines changed: 316 additions & 16143 deletions

Some content is hidden

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

integration/graphql/package-lock.json

Lines changed: 3 additions & 3 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"rxjs": "6.5.2",
2020
"subscriptions-transport-ws": "0.9.16",
2121
"typescript": "3.5.3",
22-
"ws": "7.1.1"
22+
"ws": "7.1.2"
2323
},
2424
"devDependencies": {
2525
"@types/node": "7.10.7",

integration/hello-world/package-lock.json

Lines changed: 29 additions & 23 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"@nestjs/testing": "6.5.3",
1414
"@nestjs/websockets": "6.5.3",
1515
"class-transformer": "0.2.3",
16-
"class-validator": "0.9.1",
17-
"fastify": "2.7.0",
16+
"class-validator": "0.10.0",
17+
"fastify": "2.7.1",
1818
"reflect-metadata": "0.1.13",
1919
"rxjs": "6.5.2",
2020
"typescript": "3.5.3"

integration/hooks/package-lock.json

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

integration/hooks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@nestjs/common": "6.5.3",
1111
"@nestjs/core": "6.5.3",
1212
"class-transformer": "0.2.3",
13-
"class-validator": "0.9.1",
13+
"class-validator": "0.10.0",
1414
"reflect-metadata": "0.1.13",
1515
"rxjs": "6.5.2",
1616
"typescript": "3.5.3"

integration/injector/package-lock.json

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

integration/injector/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@nestjs/testing": "6.5.3",
1414
"@nestjs/websockets": "6.5.3",
1515
"class-transformer": "0.2.3",
16-
"class-validator": "0.9.1",
16+
"class-validator": "0.10.0",
1717
"reflect-metadata": "0.1.13",
1818
"rxjs": "6.5.2",
1919
"typescript": "3.5.3"

integration/microservices/package-lock.json

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

integration/microservices/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@nestjs/websockets": "6.5.3",
1616
"amqp-connection-manager": "3.0.0",
1717
"class-transformer": "0.2.3",
18-
"class-validator": "0.9.1",
18+
"class-validator": "0.10.0",
1919
"reflect-metadata": "0.1.13",
2020
"rxjs": "6.5.2",
2121
"typescript": "3.5.3"

0 commit comments

Comments
 (0)