Skip to content

Commit b7da58a

Browse files
committed
Merge remote-tracking branch 'origin/develop' into @truffle/config/typescript-migration
# Conflicts: # yarn.lock
2 parents f20a125 + 3b6f604 commit b7da58a

File tree

21 files changed

+1554
-1030
lines changed

21 files changed

+1554
-1030
lines changed

packages/artifactor/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "MIT",
66
"author": "Tim Coulter",
77
"repository": "https://github.com/trufflesuite/truffle/tree/master/packages/artifactor",
8-
"version": "4.0.32",
8+
"version": "4.0.33",
99
"main": "dist/index.js",
1010
"scripts": {
1111
"build": "tsc",
@@ -18,7 +18,7 @@
1818
"lodash": "^4.17.13"
1919
},
2020
"devDependencies": {
21-
"@truffle/contract": "^4.0.33",
21+
"@truffle/contract": "^4.0.34",
2222
"@types/fs-extra": "^8.0.0",
2323
"@types/node": "^12.6.2",
2424
"chai": "4.2.0",

packages/blockchain-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"bugs": {
99
"url": "https://github.com/trufflesuite/truffle/issues"
1010
},
11-
"version": "0.0.12",
11+
"version": "0.0.13",
1212
"main": "dist/index.js",
1313
"scripts": {
1414
"build": "tsc",

packages/box/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"author": "g. nicholas d'andrea <gnidan@trufflesuite.com>",
66
"repository": "https://github.com/trufflesuite/truffle/tree/master/packages/box",
7-
"version": "1.0.38",
7+
"version": "1.0.39",
88
"main": "dist/box.js",
99
"scripts": {
1010
"build": "tsc",
@@ -13,7 +13,7 @@
1313
},
1414
"types": "./typings/index.d.ts",
1515
"dependencies": {
16-
"@truffle/config": "^1.1.21",
16+
"@truffle/config": "^1.2.0",
1717
"fs-extra": "6.0.1",
1818
"github-download": "^0.5.0",
1919
"inquirer": "^7.0.0",

packages/code-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"author": "",
66
"repository": "https://github.com/trufflesuite/truffle/tree/master/packages/code-utils",
7-
"version": "1.2.7",
7+
"version": "1.2.8",
88
"main": "dist/index.js",
99
"scripts": {
1010
"build": "tsc",

packages/compile-solidity/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "@truffle/compile-solidity",
33
"description": "Compiler helper and artifact manager for Solidity files",
4-
"version": "4.2.5",
4+
"version": "4.2.6",
55
"main": "index.js",
66
"dependencies": {
7-
"@truffle/config": "^1.1.21",
7+
"@truffle/config": "^1.2.0",
88
"@truffle/contract-sources": "^0.1.6",
99
"@truffle/error": "^0.0.7",
1010
"@truffle/expect": "^0.0.11",

packages/compile-vyper/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
"license": "MIT",
55
"author": "Evgeniy Filatov <evgeniyfilatov@gmail.com>",
66
"repository": "https://github.com/trufflesuite/truffle/tree/master/packages/compile-vyper",
7-
"version": "1.0.29",
7+
"version": "1.0.30",
88
"main": "index.js",
99
"scripts": {
1010
"test": "mocha"
1111
},
1212
"dependencies": {
13-
"@truffle/compile-solidity": "^4.2.5",
13+
"@truffle/compile-solidity": "^4.2.6",
1414
"async": "2.6.1",
1515
"colors": "^1.1.2",
1616
"eslint": "^5.5.0",
1717
"minimatch": "^3.0.4"
1818
},
1919
"devDependencies": {
20-
"@truffle/config": "^1.1.21",
20+
"@truffle/config": "^1.2.0",
2121
"mocha": "5.2.0"
2222
},
2323
"keywords": [

packages/config/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@truffle/config",
3-
"version": "1.1.21",
3+
"version": "1.2.0",
44
"description": "Utility for interacting with truffle-config.js files",
55
"main": "dist/index.js",
66
"typings": "dist/index.d.ts",
@@ -33,7 +33,7 @@
3333
},
3434
"dependencies": {
3535
"@truffle/error": "^0.0.7",
36-
"@truffle/provider": "^0.1.17",
36+
"@truffle/provider": "^0.1.18",
3737
"configstore": "^4.0.0",
3838
"find-up": "^2.1.0",
3939
"lodash": "^4.17.13",

packages/contract/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"bugs": {
99
"url": "https://github.com/trufflesuite/truffle/issues"
1010
},
11-
"version": "4.0.33",
11+
"version": "4.0.34",
1212
"main": "index.js",
1313
"typings": "./typings/index.d.ts",
1414
"scripts": {
@@ -20,10 +20,10 @@
2020
"test:trace": "$(yarn bin)/mocha --trace-warnings"
2121
},
2222
"dependencies": {
23-
"@truffle/blockchain-utils": "^0.0.12",
23+
"@truffle/blockchain-utils": "^0.0.13",
2424
"@truffle/contract-schema": "^3.0.16",
2525
"@truffle/error": "^0.0.7",
26-
"@truffle/interface-adapter": "^0.2.6",
26+
"@truffle/interface-adapter": "^0.2.7",
2727
"bignumber.js": "^7.2.1",
2828
"ethers": "^4.0.0-beta.1",
2929
"web3": "1.2.1",
@@ -32,7 +32,7 @@
3232
"web3-utils": "1.2.1"
3333
},
3434
"devDependencies": {
35-
"@truffle/compile-solidity": "^4.2.5",
35+
"@truffle/compile-solidity": "^4.2.6",
3636
"async": "2.6.1",
3737
"browserify": "^14.0.0",
3838
"chai": "4.2.0",

packages/core/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"bugs": {
88
"url": "https://github.com/trufflesuite/truffle/issues"
99
},
10-
"version": "5.0.37",
10+
"version": "5.0.38",
1111
"bin": {
1212
"truffle": "./cli.js",
1313
"truffle-exec": "./exec.js"
@@ -16,24 +16,24 @@
1616
"test": "mocha ./test/** ./test/**/*"
1717
},
1818
"dependencies": {
19-
"@truffle/artifactor": "^4.0.32",
20-
"@truffle/box": "^1.0.38",
21-
"@truffle/compile-solidity": "^4.2.5",
22-
"@truffle/config": "^1.1.21",
23-
"@truffle/contract": "^4.0.33",
19+
"@truffle/artifactor": "^4.0.33",
20+
"@truffle/box": "^1.0.39",
21+
"@truffle/compile-solidity": "^4.2.6",
22+
"@truffle/config": "^1.2.0",
23+
"@truffle/contract": "^4.0.34",
2424
"@truffle/contract-sources": "^0.1.6",
2525
"@truffle/debug-utils": "^1.0.19",
26-
"@truffle/debugger": "^5.0.28",
27-
"@truffle/deployer": "^3.0.34",
26+
"@truffle/debugger": "^5.0.29",
27+
"@truffle/deployer": "^3.0.35",
2828
"@truffle/error": "^0.0.7",
2929
"@truffle/expect": "^0.0.11",
30-
"@truffle/interface-adapter": "^0.2.6",
31-
"@truffle/migrate": "^3.0.34",
32-
"@truffle/provider": "^0.1.17",
30+
"@truffle/interface-adapter": "^0.2.7",
31+
"@truffle/migrate": "^3.0.35",
32+
"@truffle/provider": "^0.1.18",
3333
"@truffle/provisioner": "^0.1.6",
34-
"@truffle/require": "^2.0.21",
34+
"@truffle/require": "^2.0.22",
3535
"@truffle/resolver": "^5.0.17",
36-
"@truffle/workflow-compile": "^2.1.6",
36+
"@truffle/workflow-compile": "^2.1.7",
3737
"app-module-path": "^2.2.0",
3838
"async": "2.6.1",
3939
"bip39": "^2.2.0",
@@ -68,7 +68,7 @@
6868
"yargs": "^8.0.2"
6969
},
7070
"devDependencies": {
71-
"@truffle/blockchain-utils": "^0.0.12",
71+
"@truffle/blockchain-utils": "^0.0.13",
7272
"glob": "^7.1.2",
7373
"memorystream": "^0.3.1"
7474
},

packages/debugger/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"bugs": {
99
"url": "https://github.com/trufflesuite/truffle/issues"
1010
},
11-
"version": "5.0.28",
11+
"version": "5.0.29",
1212
"main": "dist/debugger.js",
1313
"scripts": {
1414
"build": "webpack --config webpack/webpack.config.js",
@@ -20,7 +20,7 @@
2020
"test:debug": "NODE_ENV=testing node --inspect ./node_modules/.bin/mocha-webpack --webpack-config webpack/webpack.config-test.js --recursive"
2121
},
2222
"dependencies": {
23-
"@truffle/code-utils": "^1.2.7",
23+
"@truffle/code-utils": "^1.2.8",
2424
"@truffle/decode-utils": "^1.0.18",
2525
"@truffle/decoder": "^3.0.13",
2626
"@truffle/expect": "^0.0.11",
@@ -38,12 +38,12 @@
3838
"web3-eth-abi": "1.2.1"
3939
},
4040
"devDependencies": {
41-
"@truffle/artifactor": "^4.0.32",
42-
"@truffle/box": "^1.0.38",
41+
"@truffle/artifactor": "^4.0.33",
42+
"@truffle/box": "^1.0.39",
4343
"@truffle/debug-utils": "^1.0.19",
44-
"@truffle/migrate": "^3.0.34",
44+
"@truffle/migrate": "^3.0.35",
4545
"@truffle/resolver": "^5.0.17",
46-
"@truffle/workflow-compile": "^2.1.6",
46+
"@truffle/workflow-compile": "^2.1.7",
4747
"async": "2.6.1",
4848
"babel-core": "^6.26.0",
4949
"babel-loader": "^7.1.2",

0 commit comments

Comments
 (0)