Skip to content

Commit 42ba60f

Browse files
authored
Merge branch 'main' into version-bump
2 parents 24c7050 + 7eccf80 commit 42ba60f

5 files changed

Lines changed: 695 additions & 645 deletions

File tree

.github/actions/setup/action.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ runs:
99
registry-url: https://registry.npmjs.org
1010
always-auth: true
1111
cache: yarn
12+
- run: corepack enable
13+
shell: bash
1214
- run: yarn install --frozen-lockfile
1315
shell: bash

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
nodejs 24.15.0
2+
yarn 1.22.22

.yarnrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry "https://registry.yarnpkg.com/"

package.json

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
"main": "dist/index.js",
55
"license": "MIT",
66
"repository": "git://github.com/smartcontractkit/ea-framework-js.git",
7+
"packageManager": "yarn@1.22.22",
78
"dependencies": {
9+
"@date-fns/tz": "1.4.1",
810
"ajv": "8.20.0",
911
"axios": "1.15.2",
1012
"eventsource": "4.1.0",
@@ -15,8 +17,7 @@
1517
"pino-pretty": "13.1.3",
1618
"prom-client": "15.1.3",
1719
"redlock": "5.0.0-beta.2",
18-
"ws": "8.20.0",
19-
"@date-fns/tz": "1.4.1"
20+
"ws": "8.20.0"
2021
},
2122
"scripts": {
2223
"build": "rm -rf dist/src && mkdir -p ./dist/src && cp package.json dist/src && cp README.md dist/src && tsc && yarn pre-build-generator",
@@ -28,15 +29,21 @@
2829
"lint": "eslint --max-warnings=0 . && prettier --check '**/*.{ts,md,json,yaml}'",
2930
"portal-path": "echo \"portal:$(readlink -f ./dist/src)\"",
3031
"test-debug": "EA_HOST=localhost LOG_LEVEL=trace DEBUG=true EA_PORT=0 c8 ava --verbose",
31-
"test": "tsc -p test/tsconfig.json --noEmit && yarn ava",
32+
"test": "tsc && tsc -p test/tsconfig.json && yarn ava",
3233
"ava": "EA_HOST=localhost LOG_LEVEL=error EA_PORT=0 c8 ava",
3334
"verify": "yarn lint && yarn build && yarn build -p ./test/tsconfig.json && yarn test && yarn code-coverage",
3435
"code-coverage": "c8 check-coverage --statements 95 --lines 95 --functions 95 --branches 90"
3536
},
3637
"bin": {
3738
"create-external-adapter": "adapter-generator.js"
3839
},
40+
"resolutions": {
41+
"cross-spawn": "7.0.6",
42+
"flatted": "3.4.2",
43+
"lodash": "4.18.1"
44+
},
3945
"devDependencies": {
46+
"@ava/typescript": "7.0.0",
4047
"@eslint/eslintrc": "3.3.5",
4148
"@eslint/js": "10.0.1",
4249
"@sinonjs/fake-timers": "15.3.2",
@@ -45,7 +52,7 @@
4552
"@types/ws": "8.18.1",
4653
"@typescript-eslint/eslint-plugin": "8.59.1",
4754
"@typescript-eslint/parser": "8.59.1",
48-
"ava": "7.0.0",
55+
"ava": "8.0.0",
4956
"axios-mock-adapter": "2.1.0",
5057
"c8": "11.0.0",
5158
"eslint": "10.3.0",
@@ -70,12 +77,16 @@
7077
"files": [
7178
"test/**/*.test.ts"
7279
],
73-
"extensions": {
74-
"mjs": true,
75-
"ts": "commonjs"
80+
"extensions": [
81+
"mjs"
82+
],
83+
"typescript": {
84+
"rewritePaths": {
85+
"test/": "dist/test/"
86+
},
87+
"compile": false
7688
},
7789
"require": [
78-
"ts-node/register",
7990
"./test/_force-exit.mjs"
8091
],
8192
"workerThreads": false,

0 commit comments

Comments
 (0)