Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 8405855

Browse files
author
Michal Vlasák
committed
Convert to Typescript
1 parent 3624de8 commit 8405855

18 files changed

Lines changed: 387 additions & 113 deletions

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
coverage
2+
dist

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
node_modules
22
coverage
3-
4-
.idea/*
3+
dist
4+
.idea/*
5+
.vscode/*

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"printWidth": 120,
33
"tabWidth": 4,
44
"singleQuote": true,
5-
"trailingComma": "es5"
5+
"trailingComma": "es5",
6+
"parser": "typescript"
67
}

jest.config.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module.exports = {
2+
transform: {
3+
'^.+\\.tsx?$': 'ts-jest',
4+
},
5+
testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
6+
testPathIgnorePatterns: ['/node_modules/', '/dist/'],
7+
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
8+
setupTestFrameworkScriptFile: 'jest-expect-message',
9+
collectCoverage: true,
10+
};

package-lock.json

Lines changed: 216 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@
44
"description": "Ackee Node Logger",
55
"main": "index.js",
66
"scripts": {
7+
"build": "tsc",
78
"lint-staged": "lint-staged",
8-
"test": "jest --coverage",
9-
"test-watch": "jest --watch --coverage",
10-
"lint": "eslint .",
11-
"pretty": "prettier --write '*.js'",
9+
"test": "jest",
10+
"test-watch": "jest --watch",
11+
"lint": "tslint -p . --force --format verbose; exit 0",
12+
"pretty": "prettier --write 'src/*.ts'",
1213
"precommit": "lint-staged && npm test",
1314
"check": "npm-check -i components -i config -i controllers -i enums -i errors -i middleware -i routes -i repositories -i services -i husky & exit 0"
1415
},
16+
"lint-staged": {
17+
"*.js": ["eslint", "git add"]
18+
},
1519
"author": "Michal Vlasák <michal.vlasak@ackee.cz>",
1620
"license": "ISC",
1721
"engines": {
@@ -31,6 +35,8 @@
3135
"pino-multi-stream": "3.1.2"
3236
},
3337
"devDependencies": {
38+
"@types/jest": "^23.3.5",
39+
"@types/node": "^10.12.0",
3440
"eslint": "^4.18.2",
3541
"eslint-config-ackee": "^0.8.1",
3642
"express": "^4.16.3",
@@ -40,11 +46,12 @@
4046
"jest-expect-message": "^1.0.1",
4147
"lint-staged": "^7.0.0",
4248
"npm-check": "^5.5.2",
43-
"prettier": "^1.11.0",
49+
"prettier": "^1.14.3",
4450
"split2": "^2.2.0",
45-
"supertest": "^3.1.0"
46-
},
47-
"jest": {
48-
"setupTestFrameworkScriptFile": "jest-expect-message"
51+
"supertest": "^3.1.0",
52+
"ts-jest": "^23.10.4",
53+
"tslint": "^5.11.0",
54+
"tslint-config-ackee": "^0.2.1",
55+
"typescript": "^3.1.3"
4956
}
5057
}

express.js renamed to src/express.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const onFinished = require('on-finished');
2-
const onHeaders = require('on-headers');
1+
import * as onFinished from 'on-finished';
2+
import * as onHeaders from 'on-headers';
33

44
const expressMiddleware = function(req, response, next) {
55
const reqIn = `--- ${req.method} ${req.originalUrl} ${req.headers['user-agent']}`;
@@ -34,7 +34,4 @@ const expressErrorMiddleware = (error, req, res, next) => {
3434
next(error);
3535
};
3636

37-
module.exports = {
38-
expressMiddleware,
39-
expressErrorMiddleware,
40-
};
37+
export { expressErrorMiddleware, expressMiddleware };

0 commit comments

Comments
 (0)