From f527cad186b199f7e5e80f38f0bc142dacf16457 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 25 Nov 2020 18:35:10 +0100 Subject: [PATCH 1/3] remove @types/helmet ref #1 --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 7fd2a19..c28f116 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "@types/cors": "^2.8.8", "@types/dotenv-safe": "^8.1.1", "@types/express": "^4.17.9", - "@types/helmet": "^4.0.0", "@types/jsonwebtoken": "^8.5.0", "@types/node": "^14.14.9", "dotenv-safe": "^8.2.0", From 595aacb311c22e63a476579f0d4d95550c314940 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 25 Nov 2020 18:41:34 +0100 Subject: [PATCH 2/3] precommit hooks & file formatting ref #1 --- package.json | 109 ++++++++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 50 deletions(-) diff --git a/package.json b/package.json index c28f116..9474f48 100644 --- a/package.json +++ b/package.json @@ -1,52 +1,61 @@ { - "name": "@lfk/backend", - "version": "1.0.0", - "main": "src/app.ts", - "repository": "https://git.odit.services/lfk/backend", - "author": { - "name": "ODIT.Services", - "email": "info@odit.services", - "url": "https://odit.services" - }, - "contributors": [ - { - "name": "Philipp Dormann", - "email": "philipp@philippdormann.de", - "url": "https://philippdormann.de" - }, - { - "name": "Nicolai Ort", - "email": "info@nicolai-ort.com", - "url": "https://nicolai-ort.com" - } - ], - "license": "CC-BY-NC-SA-4.0", - "dependencies": { - "body-parser": "^1.19.0", - "consola": "^2.15.0", - "cors": "^2.8.5", - "express": "^4.17.1", - "helmet": "^4.2.0", - "jsonwebtoken": "^8.5.1", - "mysql": "^2.18.1", - "pg": "^8.5.1", - "reflect-metadata": "^0.1.13", - "typeorm": "^0.2.29" - }, - "devDependencies": { - "@types/cors": "^2.8.8", - "@types/dotenv-safe": "^8.1.1", - "@types/express": "^4.17.9", - "@types/jsonwebtoken": "^8.5.0", - "@types/node": "^14.14.9", - "dotenv-safe": "^8.2.0", - "nodemon": "^2.0.6", - "sqlite3": "^5.0.0", - "ts-node": "^9.0.0", - "typescript": "^4.1.2" - }, - "scripts": { - "dev": "nodemon src/app.ts", - "build": "tsc" - } + "name": "@lfk/backend", + "version": "1.0.0", + "main": "src/app.ts", + "repository": "https://git.odit.services/lfk/backend", + "author": { + "name": "ODIT.Services", + "email": "info@odit.services", + "url": "https://odit.services" + }, + "contributors": [ + { + "name": "Philipp Dormann", + "email": "philipp@philippdormann.de", + "url": "https://philippdormann.de" + }, + { + "name": "Nicolai Ort", + "email": "info@nicolai-ort.com", + "url": "https://nicolai-ort.com" + } + ], + "license": "CC-BY-NC-SA-4.0", + "dependencies": { + "body-parser": "^1.19.0", + "consola": "^2.15.0", + "cors": "^2.8.5", + "express": "^4.17.1", + "helmet": "^4.2.0", + "jsonwebtoken": "^8.5.1", + "mysql": "^2.18.1", + "pg": "^8.5.1", + "reflect-metadata": "^0.1.13", + "typeorm": "^0.2.29" + }, + "devDependencies": { + "@types/cors": "^2.8.8", + "@types/dotenv-safe": "^8.1.1", + "@types/express": "^4.17.9", + "@types/jsonwebtoken": "^8.5.0", + "@types/node": "^14.14.9", + "dotenv-safe": "^8.2.0", + "husky": "^4.3.0", + "nodemon": "^2.0.6", + "prettier": "^2.2.0", + "pretty-quick": "^3.1.0", + "sqlite3": "^5.0.0", + "ts-node": "^9.0.0", + "typescript": "^4.1.2" + }, + "scripts": { + "dev": "nodemon src/app.ts", + "build": "tsc", + "format": "pretty-quick" + }, + "husky": { + "hooks": { + "pre-commit": "pretty-quick --staged" + } + } } From 992504705b89e6dd915c97bbb79ccc3c6e6c7dbb Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 25 Nov 2020 18:43:08 +0100 Subject: [PATCH 3/3] clean up app.ts ref #1 #4 --- src/app.ts | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/src/app.ts b/src/app.ts index 953f3b6..13be7ae 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,23 +1,20 @@ -import * as dotenvSafe from 'dotenv-safe'; -import express from 'express'; -import consola from 'consola'; -import * as jwt from 'jsonwebtoken'; -import { createConnection } from 'typeorm'; -import bodyparser from "body-parser"; -import 'reflect-metadata'; -import routerMain from './routes/index'; -// const loaders = require('./loaders'); -import loaders from './loaders/index'; +import * as dotenvSafe from "dotenv-safe"; +import express from "express"; +import consola from "consola"; +// import * as jwt from 'jsonwebtoken'; +import "reflect-metadata"; +import loaders from "./loaders/index"; dotenvSafe.config(); -let app = express(); const PORT = process.env.APP_PORT || 4010; async function main() { - await loaders(app); - app.listen(PORT, () => { - consola.success(`⚡️[server]: Server is running at http://localhost:${PORT}`); - }); + let app = express(); + await loaders(app); + app.listen(PORT, () => { + consola.success( + `⚡️[server]: Server is running at http://localhost:${PORT}` + ); + }); } - -main() \ No newline at end of file +main();