Merge branch 'Sacro-wait-on-concurrently'

nodemon.json

@@ -1,6 +1,5 @@
 {
-  "watch": ["src"],
+  "watch": ["dist"],
-  "ext": "ts",
+  "ext": "js",
-  "ignore": ["src/**/*.spec.ts"],
+  "exec": "node dist/main"
-  "exec": "ts-node -r tsconfig-paths/register src/main.ts"
 }

package.json

@@ -7,7 +7,7 @@
     "build": "tsc -p tsconfig.build.json",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "start": "ts-node -r tsconfig-paths/register src/main.ts",
-    "start:dev": "nodemon",
+    "start:dev": "concurrently \"wait-on dist/main.js && nodemon\" \"tsc -w -p tsconfig.build.json\" ",
     "start:debug": "nodemon --config nodemon-debug.json",
     "prestart:prod": "rimraf dist && npm run build",
     "start:prod": "node dist/main.js",
@@ -29,20 +29,22 @@
     "rxjs": "6.4.0"
   },
   "devDependencies": {
+    "@nestjs/testing": "6.1.1",
     "@types/express": "4.16.1",
     "@types/jest": "24.0.11",
-    "@types/node": "11.12.0",
+    "@types/node": "11.13.4",
     "@types/supertest": "2.0.7",
-    "@nestjs/testing": "6.0.1",
+    "concurrently": "^4.1.0",
-    "jest": "24.5.0",
+    "jest": "24.7.1",
-    "nodemon": "1.18.10",
+    "nodemon": "1.18.11",
-    "prettier": "1.16.4",
+    "prettier": "1.17.0",
     "supertest": "4.0.2",
-    "ts-jest": "24.0.0",
+    "ts-jest": "24.0.2",
-    "ts-node": "8.0.3",
+    "ts-node": "8.1.0",
     "tsconfig-paths": "3.8.0",
-    "tslint": "5.14.0",
+    "tslint": "5.16.0",
-    "typescript": "3.3.4000"
+    "typescript": "3.4.3",
+    "wait-on": "^3.2.0"
   },
   "jest": {
     "moduleFileExtensions": [
@@ -55,6 +57,9 @@
     "transform": {
       "^.+\\.(t|j)s$": "ts-jest"
     },
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }

src/app.controller.ts

@@ -1,4 +1,4 @@
-import { Get, Controller } from '@nestjs/common';
+import { Controller, Get } from '@nestjs/common';
 import { AppService } from './app.service';
 
 @Controller()

tsconfig.build.json

@@ -1,4 +1,4 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": ["node_modules", "test", "**/*spec.ts"]
+  "exclude": ["node_modules", "dist", "test", "**/*spec.ts"]
 }

tsconfig.json

@@ -8,7 +8,8 @@
     "target": "es6",
     "sourceMap": true,
     "outDir": "./dist",
-    "baseUrl": "./"
+    "baseUrl": "./",
+    "incremental": true,
   },
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules", "dist"]
 }