Merge branch 'feature/build_task' into develop

# Conflicts:
#	package.json
#	yarn.lock

Author: hirsch88

knexfile.ts knexfile.jsknexfile.ts renamed to knexfile.js

@@ -1,5 +1,4 @@
-import * as dotenv from 'dotenv';
-dotenv.config();
+require('dotenv').config();
 
 /**
  * This is the database configuration for the migrations and

package.json

@@ -4,7 +4,9 @@
   "description": "A delightful way to building a RESTful API with NodeJs & TypeScript",
   "main": "src/app.ts",
   "scripts": {
-    "banner": "./node_modules/.bin/ts-node --fast ./src/console/lib/banner.ts",
+    "banner": "npm run ts-node:fast -- ./src/console/lib/banner.ts",
+    "ts-node": "./node_modules/.bin/ts-node",
+    "ts-node:fast": "./node_modules/.bin/ts-node -F",
     "pretest": "./node_modules/.bin/tslint -c ./tslint.json -t stylish './test/unit/**/*.ts'",
     "test:pretty": "npm run test -- --verbose",
     "test:coverage": "npm run test -- --coverage",
@@ -17,19 +19,19 @@
     "clean:src": "./node_modules/.bin/trash './src/**/*.js' './src/**/*.js.map'",
     "clean:knex": "./node_modules/.bin/trash knexfile.js knexfile.js.map",
     "copy:assets": "npm run copy:swagger && npm run copy:public",
-    "copy:swagger": "./node_modules/.bin/copyup ./src/api/swagger.json ./dist/src",
-    "copy:public": "./node_modules/.bin/copyup ./src/public/* ./dist/src",
-    "db:migrate": "npm run banner migrate && ./node_modules/.bin/knex migrate:latest",
-    "db:migrate:rollback": "npm run banner rollback && ./node_modules/.bin/knex migrate:rollback",
-    "db:seed": "npm run banner seed && ./node_modules/.bin/knex seed:run",
+    "copy:swagger": "./node_modules/.bin/copyup ./src/api/swagger.json ./dist",
+    "copy:public": "./node_modules/.bin/copyup ./src/public/* ./dist",
+    "db:migrate": "npm run banner migrate && npm run ts-node:fast -- ./node_modules/.bin/knex migrate:latest",
+    "db:migrate:rollback": "npm run banner rollback && npm run ts-node:fast -- ./node_modules/.bin/knex migrate:rollback",
+    "db:seed": "npm run banner seed && npm run ts-node:fast -- ./node_modules/.bin/knex seed:run",
     "db:reset": "npm run console db:reset",
-    "console": "./node_modules/.bin/ts-node --fast ./src/console/commander.ts",
-    "console:dev": "./node_modules/.bin/ts-node ./src/console/commander.ts",
-    "console:help": "./node_modules/.bin/ts-node --fast ./src/console/commander.ts --help",
-    "setup": "yarn install && npm run db:migrate && npm run db:seed",
+    "console": "npm run ts-node:fast -- ./src/console/commander.ts",
+    "console:dev": "npm run ts-node -- ./src/console/commander.ts",
+    "console:help": "npm run ts-node:fast -- ./src/console/commander.ts --help",
+    "setup": "npm run banner setup && yarn install && npm run db:migrate && npm run db:seed",
     "serve": "npm run banner serve && ./node_modules/.bin/nodemon --watch 'src/**/*.ts' --watch 'src/**/*.json' --watch '.env'",
     "test": "npm run banner test && NODE_ENV=test ./node_modules/.bin/jest ./test/unit",
-    "build": "npm run banner build && npm run lint && npm run clean:src && npm run transpile && npm run clean:knex",
+    "build": "npm run banner build && npm run lint && npm run clean:dist && npm run transpile && npm run copy:assets",
     "start": "node dist/app.js"
   },
   "repository": "git+ssh://git@github.com/w3tec/express-typescript-boilerplate.git",

src/types/knexfile.d.ts

@@ -0,0 +1,4 @@
+declare module '*knexfile' {
+    let knexfile: any;
+    export default knexfile;
+}