joelson
/
svr-imp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge: resolve package.json conflicts

This commit is contained in:
Kamil Myśliwiec 2018-11-03 15:28:37 +01:00
parent 583f0ecb11 c88433bfb1
commit 2c0b2f5678
No known key found for this signature in database
GPG Key ID: 75F02E89A1A1092B
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodemon-debug.json
View File

@ -2,5 +2,5 @@
"watch": ["src"], "watch": ["src"],
"ext": "ts", "ext": "ts",
"ignore": ["src/**/*.spec.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"
} }

6
package.json
View File

@ -25,8 +25,7 @@
"@nestjs/websockets": "^5.1.0", "@nestjs/websockets": "^5.1.0",
"@types/node": "^10.7.1", "@types/node": "^10.7.1",
"reflect-metadata": "^0.1.12", "reflect-metadata": "^0.1.12",
"rxjs": "^6.2.2", "rxjs": "^6.2.2"
"typescript": "^3.0.1"
}, },
"devDependencies": { "devDependencies": {
"@types/express": "^4.16.0", "@types/express": "^4.16.0",
@ -41,7 +40,8 @@
"ts-loader": "^4.4.2", "ts-loader": "^4.4.2",
"ts-node": "^7.0.1", "ts-node": "^7.0.1",
"tsconfig-paths": "^3.5.0", "tsconfig-paths": "^3.5.0",
"tslint": "5.11.0" "tslint": "5.11.0",
"typescript": "^3.0.1"
}, },
"jest": { "jest": {
"moduleFileExtensions": [ "moduleFileExtensions": [