Skip to content

Commit 6094233

Browse files
committed
fix: 🐛 Fix typings and update deps
Also bumping for fixes by @Karlinator in his PR #2
1 parent 637a8e7 commit 6094233

File tree

6 files changed

+5751
-10278
lines changed

6 files changed

+5751
-10278
lines changed

.github/workflows/test.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
name: Test
22

33
on:
4-
push:
5-
branches:
6-
- latest
7-
- latest-next
8-
- next
9-
- beta
10-
- "*.x" # maintenance releases branches
4+
push:
5+
branches:
6+
- latest
7+
- latest-next
8+
- next
9+
- beta
10+
- "*.x" # maintenance releases branches
1111

12-
pull_request:
13-
types:
14-
- opened
15-
- synchronize
12+
pull_request:
13+
types:
14+
- opened
15+
- synchronize
1616

1717
jobs:
18-
test_matrix:
19-
strategy:
20-
matrix:
21-
node-version:
22-
- 12
23-
- 14
24-
- 16 # Becomes active in early April 2021
18+
test_matrix:
19+
strategy:
20+
matrix:
21+
node-version:
22+
- 12
23+
- 14
24+
- 16 # Becomes active in early April 2021
2525

26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-latest
2727

28-
steps:
29-
- uses: actions/checkout@v2
30-
- run: git config --global user.name github-actions
31-
- run: git config --global user.email [email protected]
32-
- name: Use Node.js ${{ matrix.node-version }}
33-
uses: actions/setup-node@v2
34-
with:
35-
node-version: ${{ matrix.node-version }}
36-
- uses: bahmutov/npm-install@v1
37-
- run: npm run test
28+
steps:
29+
- uses: actions/checkout@v2
30+
- run: git config --global user.name github-actions
31+
- run: git config --global user.email [email protected]
32+
- name: Use Node.js ${{ matrix.node-version }}
33+
uses: actions/setup-node@v2
34+
with:
35+
node-version: ${{ matrix.node-version }}
36+
- uses: bahmutov/npm-install@v1
37+
- run: npm run test

config/jest.config.ts renamed to config/jest.config.cjs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import type {Config } from '@jest/types';
2-
import {jsWithTs} from 'ts-jest/presets';
3-
const config: Config.InitialOptions = {
1+
const {jsWithTs} = require('ts-jest/presets');
2+
const config =
3+
/** @type {import('@jest/types').InitialOptions} */
4+
{
45
'rootDir':'../',
56
'preset': 'ts-jest/presets/js-with-ts',
67
testEnvironment: 'node',
@@ -23,4 +24,4 @@ const config: Config.InitialOptions = {
2324
},
2425
},
2526
};
26-
export default config;
27+
module.exports = config;

0 commit comments

Comments
 (0)