Skip to content

Commit 6c35d90

Browse files
committed
Merge remote-tracking branch 'origin/develop' into @truffle/config/typescript-migration
# Conflicts: # yarn.lock
2 parents bb3b19e + c1d8331 commit 6c35d90

File tree

17 files changed

+2033
-1542
lines changed

17 files changed

+2033
-1542
lines changed

packages/hdwallet-provider/package.json

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,34 @@
1010
},
1111
"version": "1.0.18",
1212
"main": "dist/index.js",
13+
"types": "dist/index.d.ts",
1314
"scripts": {
14-
"prepare": "npx webpack --config webpack/webpack.config.js",
15-
"test": "mocha --timeout 5000"
15+
"build": "tsc",
16+
"prepare": "yarn build",
17+
"test": "yarn build && mocha --exit -r ts-node/register test/**/*.test.ts"
1618
},
1719
"dependencies": {
1820
"any-promise": "^1.3.0",
19-
"bindings": "^1.3.1",
21+
"bindings": "^1.5.0",
22+
"bip39": "^2.4.2",
23+
"debug": "^4.1.1",
24+
"ethereum-protocol": "^1.0.1",
25+
"ethereumjs-tx": "^2.1.1",
26+
"ethereumjs-util": "^6.1.0",
27+
"ethereumjs-wallet": "^0.6.3",
2028
"web3": "1.2.1",
21-
"websocket": "^1.0.28"
29+
"web3-provider-engine": "https://github.com/trufflesuite/provider-engine#web3-one"
2230
},
2331
"devDependencies": {
24-
"@babel/core": "^7.0.0-0",
25-
"bip39": "^2.2.0",
26-
"ethereumjs-tx": "^1.3.7",
27-
"ethereumjs-util": "^5.2.0",
28-
"ethereumjs-wallet": "^0.6.2",
29-
"ganache-core": "2.7.0",
30-
"js-scrypt": "^0.2.0",
31-
"mocha": "5.2.0",
32-
"web3-provider-engine": "https://github.com/trufflesuite/provider-engine#web3-one",
33-
"webpack": "^4.24.0",
34-
"webpack-cli": "^3.1.2"
32+
"@types/bip39": "^2.4.2",
33+
"@types/ethereum-protocol": "^1.0.0",
34+
"@types/ethereumjs-util": "^5.2.0",
35+
"@types/mocha": "^5.2.7",
36+
"@types/web3-provider-engine": "^14.0.0",
37+
"ganache-core": "^2.8.0",
38+
"mocha": "6.2.0",
39+
"ts-node": "^8.4.1",
40+
"typescript": "^3.6.3"
3541
},
3642
"publishConfig": {
3743
"access": "public"

packages/hdwallet-provider/src/index.js

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

0 commit comments

Comments
 (0)