chore(): resolve conflicts, update tsconfig

This commit is contained in:
Kamil Myśliwiec
2022-03-03 10:05:11 +01:00
5 changed files with 27 additions and 24 deletions

42
package-lock.json generated
View File

@@ -3535,14 +3535,14 @@
}
},
"@nestjs/graphql": {
"version": "10.0.5",
"resolved": "https://registry.npmjs.org/@nestjs/graphql/-/graphql-10.0.5.tgz",
"integrity": "sha512-ok7dXJOIw3hqoler3IP/ehm2S9FBQLgmjKguuPB4OMe/pk4TbcDXzQO7SPzwkgVMB/H/fhol9+kHoCXrCMHf7w==",
"version": "10.0.6",
"resolved": "https://registry.npmjs.org/@nestjs/graphql/-/graphql-10.0.6.tgz",
"integrity": "sha512-ASqvrlnkElobGv/MwxpFK82PBwitGo61bJKoNAPOLo3kHG7XEeT+GHJYfGfaFyEdryynk9wlqJlx5XNfJl00Rw==",
"dev": true,
"requires": {
"@graphql-tools/merge": "8.2.2",
"@graphql-tools/schema": "8.3.1",
"@graphql-tools/utils": "8.6.1",
"@graphql-tools/merge": "8.2.3",
"@graphql-tools/schema": "8.3.2",
"@graphql-tools/utils": "8.6.2",
"@nestjs/mapped-types": "1.0.1",
"chokidar": "3.5.3",
"fast-glob": "3.2.11",
@@ -3557,31 +3557,31 @@
},
"dependencies": {
"@graphql-tools/merge": {
"version": "8.2.2",
"resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.2.tgz",
"integrity": "sha512-2DyqhIOMUMKbCPqo8p6xSdll2OBcBxGdOrxlJJlFQvinsSaYqp/ct3dhAxNtzaIcvSVgXvttQqfD7O2ziFtE7Q==",
"version": "8.2.3",
"resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.3.tgz",
"integrity": "sha512-XCSmL6/Xg8259OTWNp69B57CPWiVL69kB7pposFrufG/zaAlI9BS68dgzrxmmSqZV5ZHU4r/6Tbf6fwnEJGiSw==",
"dev": true,
"requires": {
"@graphql-tools/utils": "^8.5.1",
"@graphql-tools/utils": "^8.6.2",
"tslib": "~2.3.0"
}
},
"@graphql-tools/schema": {
"version": "8.3.1",
"resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.1.tgz",
"integrity": "sha512-3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ==",
"version": "8.3.2",
"resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.2.tgz",
"integrity": "sha512-77feSmIuHdoxMXRbRyxE8rEziKesd/AcqKV6fmxe7Zt+PgIQITxNDew2XJJg7qFTMNM43W77Ia6njUSBxNOkwg==",
"dev": true,
"requires": {
"@graphql-tools/merge": "^8.2.1",
"@graphql-tools/utils": "^8.5.1",
"@graphql-tools/merge": "^8.2.3",
"@graphql-tools/utils": "^8.6.2",
"tslib": "~2.3.0",
"value-or-promise": "1.0.11"
}
},
"@graphql-tools/utils": {
"version": "8.6.1",
"resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.1.tgz",
"integrity": "sha512-uxcfHCocp4ENoIiovPxUWZEHOnbXqj3ekWc0rm7fUhW93a1xheARNHcNKhwMTR+UKXVJbTFQdGI1Rl5XdyvDBg==",
"version": "8.6.2",
"resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.2.tgz",
"integrity": "sha512-x1DG0cJgpJtImUlNE780B/dfp8pxvVxOD6UeykFH5rHes26S4kGokbgU8F1IgrJ1vAPm/OVBHtd2kicTsPfwdA==",
"dev": true,
"requires": {
"tslib": "~2.3.0"
@@ -11812,9 +11812,9 @@
}
},
"eslint-config-prettier": {
"version": "8.4.0",
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.4.0.tgz",
"integrity": "sha512-CFotdUcMY18nGRo5KGsnNxpznzhkopOcOo0InID+sgQssPrzjvsyKZPvOgymTFeHrFuC3Tzdf2YndhXtULK9Iw==",
"version": "8.5.0",
"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
"integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
"dev": true
},
"eslint-import-resolver-node": {

View File

@@ -75,7 +75,7 @@
"@grpc/grpc-js": "1.5.7",
"@grpc/proto-loader": "0.6.9",
"@nestjs/apollo": "10.0.5",
"@nestjs/graphql": "10.0.5",
"@nestjs/graphql": "10.0.6",
"@nestjs/mongoose": "9.0.2",
"@nestjs/typeorm": "8.0.3",
"@types/amqplib": "0.8.2",
@@ -117,7 +117,7 @@
"delete-empty": "3.0.0",
"engine.io-client": "6.1.1",
"eslint": "7.32.0",
"eslint-config-prettier": "8.4.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-import": "2.25.4",
"eventsource": "1.1.0",
"fancy-log": "2.0.0",

View File

@@ -11,6 +11,7 @@
"noLib": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"useUnknownInCatchVariables": false,
"target": "es2017",
"sourceMap": false,
"allowJs": false,

View File

@@ -29,7 +29,8 @@
"class-validator": "0.13.2",
"reflect-metadata": "0.1.13",
"rimraf": "3.0.2",
"rxjs": "7.4.0"
"rxjs": "7.4.0",
"socket.io": "4.4.1"
},
"devDependencies": {
"@nestjs/cli": "8.1.7",

View File

@@ -8,6 +8,7 @@
"noLib": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"useUnknownInCatchVariables": false,
"target": "es6",
"sourceMap": true,
"allowJs": true,