Skip to content

Commit 5635328

Browse files
authored
Bump mocha + ts-node (#590)
* Bump mocha + ts-node * use .nvmrc in workflows * Update tsconfig.json * dont cache then...
1 parent 88a3b79 commit 5635328

File tree

12 files changed

+263
-354
lines changed

12 files changed

+263
-354
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515

1616
steps:
1717
- uses: actions/[email protected]
18-
- name: Use Node.js 18
18+
- name: Use Node.js
1919
uses: actions/[email protected]
2020
with:
21-
node-version: 18
21+
node-version-file: ".nvmrc"
2222
- run: npm install
2323
- run: npm test

.github/workflows/npmpublish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/[email protected]
1515
- uses: actions/[email protected]
1616
with:
17-
node-version: 18
17+
node-version-file: ".nvmrc"
1818
- run: npm install
1919
- run: npm test
2020

.mocharc.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
# https://github.com/mochajs/mocha/blob/master/example/config/.mocharc.yml
2-
require:
3-
- ts-node/register
4-
- reify
52
timeout: 100
63
watch-files:
74
- "lib/*.ts"

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
lts/iron

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,22 @@
2525
"scripts": {
2626
"watch": "tsc --watch",
2727
"build": "tsc && rollup -c",
28-
"test": "tsc && prettier --check . && mocha",
28+
"test": "tsc && prettier --check . && mocha --loader=ts-node/esm",
2929
"format": "prettier --write .",
3030
"prepublishOnly": "rm -rf dist && yarn build && npm test"
3131
},
3232
"author": "Paulus Schoutsen <[email protected]>",
3333
"license": "Apache-2.0",
3434
"devDependencies": {
3535
"@types/assert": "^1.4.7",
36-
"@types/mocha": "^9.0.0",
36+
"@types/mocha": "^10.0.9",
3737
"assert": "^2.0.0",
3838
"husky": "^4.2.5",
3939
"lint-staged": "^15.0.1",
40-
"mocha": "^8.0.1",
40+
"mocha": "^10.8.2",
4141
"prettier": "^3.0.0",
42-
"reify": "^0.20.12",
4342
"rollup": "^4.3.0",
44-
"ts-node": "^9.0.0",
43+
"ts-node": "^10.9.2",
4544
"typescript": "^5.2.2"
4645
},
4746
"files": [

test/auth.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import * as assert from "assert";
1+
import { strictEqual } from "assert";
22

3-
import { Auth } from "../dist/auth";
3+
import { Auth } from "../dist/auth.js";
44

55
describe("Auth", () => {
66
it("should indicate correctly when token expired", () => {
@@ -12,7 +12,7 @@ describe("Auth", () => {
1212
expires_in: 3000,
1313
expires: Date.now() - 1000,
1414
});
15-
assert.strictEqual(auth.expired, true);
15+
strictEqual(auth.expired, true);
1616
});
1717
it("should indicate correctly when token not expired", () => {
1818
const auth = new Auth({
@@ -23,6 +23,6 @@ describe("Auth", () => {
2323
expires_in: 3000,
2424
expires: Date.now() + 1000,
2525
});
26-
assert.strictEqual(auth.expired, false);
26+
strictEqual(auth.expired, false);
2727
});
2828
});

test/config.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as assert from "assert";
22

3-
import { subscribeConfig } from "../dist/config";
4-
import { MockConnection, AwaitableEvent } from "./util";
3+
import { subscribeConfig } from "../dist/config.js";
4+
import { MockConnection, AwaitableEvent } from "./util.js";
55

66
const MOCK_CONFIG = {
77
hello: "bla",

test/entities.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as assert from "assert";
22

3-
import { subscribeEntities } from "../dist/entities";
4-
import { MockConnection, AwaitableEvent } from "./util";
3+
import { subscribeEntities } from "../dist/entities.js";
4+
import { MockConnection, AwaitableEvent } from "./util.js";
55

66
const MOCK_LIGHT = {
77
entity_id: "light.kitchen",

test/services.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as assert from "assert";
22

3-
import { subscribeServices } from "../dist/services";
4-
import { MockConnection, AwaitableEvent } from "./util";
3+
import { subscribeServices } from "../dist/services.js";
4+
import { MockConnection, AwaitableEvent } from "./util.js";
55

66
const MOCK_SERVICES = {
77
light: {

test/util.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Connection } from "../dist/connection";
2-
import { HaWebSocket } from "../dist/socket";
1+
import { Connection } from "../dist/connection.js";
2+
import { HaWebSocket } from "../dist/socket.js";
33

44
class MockWebSocket {
55
addEventListener(eventType: string, callback: () => {}) {}

0 commit comments

Comments
 (0)