merge: resolve package.json conflicts
This commit is contained in:
commit
2c0b2f5678
|
|
@ -2,5 +2,5 @@
|
|||
"watch": ["src"],
|
||||
"ext": "ts",
|
||||
"ignore": ["src/**/*.spec.ts"],
|
||||
"exec": "node --inspect-brk -r ts-node/register src/main.ts"
|
||||
"exec": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register src/main.ts"
|
||||
}
|
||||
|
|
@ -25,8 +25,7 @@
|
|||
"@nestjs/websockets": "^5.1.0",
|
||||
"@types/node": "^10.7.1",
|
||||
"reflect-metadata": "^0.1.12",
|
||||
"rxjs": "^6.2.2",
|
||||
"typescript": "^3.0.1"
|
||||
"rxjs": "^6.2.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/express": "^4.16.0",
|
||||
|
|
@ -41,7 +40,8 @@
|
|||
"ts-loader": "^4.4.2",
|
||||
"ts-node": "^7.0.1",
|
||||
"tsconfig-paths": "^3.5.0",
|
||||
"tslint": "5.11.0"
|
||||
"tslint": "5.11.0",
|
||||
"typescript": "^3.0.1"
|
||||
},
|
||||
"jest": {
|
||||
"moduleFileExtensions": [
|
||||
|
|
|
|||
Loading…
Reference in New Issue