Skip to content
This repository was archived by the owner on Mar 20, 2024. It is now read-only.

Commit 16bed76

Browse files
authored
Merge pull request #10 from ABlockOfficial/develop
Merge Develop into Main
2 parents ffba3fc + 51b6188 commit 16bed76

File tree

7 files changed

+1944
-8367
lines changed

7 files changed

+1944
-8367
lines changed

Diff for: .github/workflows/node.js-macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [16.x]
16-
npm-version: [6.x, 8.x, 9.x]
15+
node-version: [20.x]
16+
npm-version: [9.x, 10.x]
1717

1818
steps:
1919
- uses: actions/checkout@v2

Diff for: .github/workflows/node.js-ubuntu.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [14.x, 15.x, 16.x]
16-
npm-version: [8.x, 9.x]
17-
yarn-version: [2.x, 3.x]
15+
node-version: [20.x]
16+
npm-version: [9.x, 10.x]
1817

1918
steps:
2019
- uses: actions/checkout@v2

Diff for: .github/workflows/node.js-windows.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [14.x, 15.x, 16.x]
16-
npm-version: [8.x, 9.x]
17-
yarn-version: [2.x, 3.x]
15+
node-version: [20.x]
16+
npm-version: [9.x, 10.x]
1817

1918
steps:
2019
- uses: actions/checkout@v2

Diff for: jest.config.js

+3
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ module.exports = {
77
"node_modules",
88
"./src"
99
],
10+
moduleNameMapper: {
11+
"axios": "axios/dist/node/axios.cjs"
12+
},
1013
moduleFileExtensions: ['ts', 'js', 'json', 'node'],
1114
};

Diff for: package-lock.json

+1,933-1,974
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@a-block/a-blockjs",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"description": "API wrapper to access the ABlock network",
55
"main": "lib/index.js",
66
"types": "lib/index.d.ts",
@@ -56,7 +56,7 @@
5656
"lib/**/*"
5757
],
5858
"dependencies": {
59-
"axios": "^0.26.0",
59+
"axios": "1.6.2",
6060
"bitcore-lib": "^8.25.25",
6161
"bitcore-mnemonic": "^8.25.25",
6262
"byte-base64": "^1.1.0",

Diff for: yarn.lock

-6,383
This file was deleted.

0 commit comments

Comments
 (0)