Skip to content

Commit 20b12b9

Browse files
authored
Merge pull request #4 from js-primer/update-ci
CI: migrate to GitHub Actions
2 parents 3c3c630 + 4ec7835 commit 20b12b9

File tree

7 files changed

+972
-1298
lines changed

7 files changed

+972
-1298
lines changed

.github/workflows/test.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: test
2+
on: [push, pull_request]
3+
env:
4+
CI: true
5+
jobs:
6+
test:
7+
name: "Test on Node.js ${{ matrix.node-version }}"
8+
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
node-version: [10, 12, 14]
12+
steps:
13+
- name: checkout
14+
uses: actions/checkout@v2
15+
- name: setup Node.js ${{ matrix.node-version }}
16+
uses: actions/setup-node@v1
17+
with:
18+
node-version: ${{ matrix.node-version }}
19+
- name: Install
20+
run: yarn install
21+
- name: Test
22+
run: yarn test

.mocharc.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"require": [
3+
"ts-node-test-register"
4+
]
5+
}

.travis.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,30 +44,30 @@
4444
"tabWidth": 4
4545
},
4646
"dependencies": {
47-
"chalk": "^2.4.2",
47+
"chalk": "^4.1.0",
4848
"connect": "^3.7.0",
4949
"detect-port": "^1.3.0",
50-
"log-symbols": "^3.0.0",
51-
"meow": "^5.0.0",
50+
"log-symbols": "^4.0.0",
51+
"meow": "^8.0.0",
5252
"serve-static": "^1.14.1"
5353
},
5454
"devDependencies": {
55-
"@types/connect": "^3.4.32",
56-
"@types/detect-port": "^1.1.0",
55+
"@types/connect": "^3.4.33",
56+
"@types/detect-port": "^1.3.0",
5757
"@types/meow": "^5.0.0",
58-
"@types/mocha": "^5.2.7",
59-
"@types/node": "^12.6.2",
60-
"@types/serve-static": "^1.13.2",
61-
"@types/supertest": "^2.0.8",
62-
"cross-env": "^5.2.0",
63-
"husky": "^3.0.0",
64-
"lint-staged": "^9.2.0",
65-
"mocha": "^6.1.4",
66-
"prettier": "^1.18.2",
67-
"supertest": "^4.0.2",
68-
"ts-node": "^8.3.0",
69-
"ts-node-test-register": "^8.0.1",
70-
"typescript": "^3.5.3"
58+
"@types/mocha": "^8.0.4",
59+
"@types/node": "^14.14.9",
60+
"@types/serve-static": "^1.13.8",
61+
"@types/supertest": "^2.0.10",
62+
"cross-env": "^7.0.2",
63+
"husky": "^4.3.0",
64+
"lint-staged": "^10.5.1",
65+
"mocha": "^8.2.1",
66+
"prettier": "^2.2.0",
67+
"supertest": "^6.0.1",
68+
"ts-node": "^9.0.0",
69+
"ts-node-test-register": "^9.0.0",
70+
"typescript": "^4.1.2"
7171
},
7272
"publishConfig": {
7373
"access": "public"

src/middlewares/response-log.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ export const responseLog = (): HandleFunction => {
1414
// items shared between the request and response of just one cycle
1515
const cycle: Cycle = {
1616
log: getLogger(),
17-
time: process.hrtime()
17+
time: process.hrtime(),
1818
};
19-
res.on("finish", () => logRes(req, res, cycle));
20-
res.on("close", () => logClose(req, res, cycle));
19+
const handleClose = () => logClose(req, res, cycle);
20+
res.on("finish", () => {
21+
logRes(req, res, cycle);
22+
res.removeListener("close", handleClose);
23+
});
24+
res.on("close", handleClose);
2125

2226
next();
2327
};

test/mocha.opts

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)