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

Commit 1a8a826

Browse files
committed
Merge branch 'develop' of github.com:trufflesuite/truffle into increase-native-buffer-size
2 parents d6a90cd + c88cd1d commit 1a8a826

File tree

22 files changed

+642
-224
lines changed

22 files changed

+642
-224
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.56",
8+
"version": "4.0.57",
99
"main": "dist/index.js",
1010
"scripts": {
1111
"build": "tsc",
@@ -20,7 +20,7 @@
2020
"source-map-support": "^0.5.16"
2121
},
2222
"devDependencies": {
23-
"@truffle/contract": "^4.2.1",
23+
"@truffle/contract": "^4.2.2",
2424
"@types/fs-extra": "^8.1.0",
2525
"@types/lodash.assign": "^4.2.6",
2626
"@types/lodash.merge": "^4.6.6",

packages/compile-solidity/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@truffle/compile-solidity",
33
"description": "Compiler helper and artifact manager for Solidity files",
4-
"version": "4.3.1",
4+
"version": "4.3.2",
55
"main": "index.js",
66
"dependencies": {
77
"@truffle/config": "^1.2.17",
@@ -20,7 +20,7 @@
2020
"solc": "^0.6.0"
2121
},
2222
"devDependencies": {
23-
"@truffle/resolver": "^5.1.10",
23+
"@truffle/resolver": "^5.1.11",
2424
"babel-core": "^6.26.0",
2525
"babel-polyfill": "^6.26.0",
2626
"babel-preset-env": "^1.6.1",

packages/contract/package.json

Lines changed: 2 additions & 2 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.2.1",
11+
"version": "4.2.2",
1212
"main": "index.js",
1313
"scripts": {
1414
"compile": "sh -c \"mkdir -p ./dist\" && browserify --debug ./index.js | exorcist ./dist/truffle-contract.js.map > ./dist/truffle-contract.js && uglifyjs ./dist/truffle-contract.js -o ./dist/truffle-contract.min.js",
@@ -35,7 +35,7 @@
3535
"web3-utils": "1.2.1"
3636
},
3737
"devDependencies": {
38-
"@truffle/compile-solidity": "^4.3.1",
38+
"@truffle/compile-solidity": "^4.3.2",
3939
"browserify": "^14.0.0",
4040
"chai": "4.2.0",
4141
"debug": "^4.1.0",

packages/core/lib/repl.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,16 @@ ReplManager.prototype.start = function(options) {
4949
// If we exit for some reason, call done functions for good measure
5050
// then ensure the process is completely killed. Once the repl exits,
5151
// the process is in a bad state and can't be recovered (e.g., stdin is closed).
52-
const doneFunctions = self.contexts.reduce((functions, context) => {
53-
if (context.done) functions.push(context.done);
54-
return functions;
55-
}, []);
56-
async.series(doneFunctions, process.exit);
52+
var doneFunctions = self.contexts.map(function(context) {
53+
return context.done
54+
? function() {
55+
context.done();
56+
}
57+
: function() {};
58+
});
59+
async.series(doneFunctions, function() {
60+
process.exit();
61+
});
5762
});
5863
}
5964

packages/core/package.json

Lines changed: 12 additions & 12 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.1.22",
10+
"version": "5.1.23",
1111
"bin": {
1212
"truffle": "./cli.js",
1313
"truffle-exec": "./exec.js"
@@ -16,27 +16,27 @@
1616
"test": "mocha ./test/** ./test/**/*"
1717
},
1818
"dependencies": {
19-
"@truffle/artifactor": "^4.0.56",
19+
"@truffle/artifactor": "^4.0.57",
2020
"@truffle/box": "^1.0.59",
2121
"@truffle/codec": "^0.5.1",
22-
"@truffle/compile-solidity": "^4.3.1",
22+
"@truffle/compile-solidity": "^4.3.2",
2323
"@truffle/config": "^1.2.17",
24-
"@truffle/contract": "^4.2.1",
24+
"@truffle/contract": "^4.2.2",
2525
"@truffle/contract-sources": "^0.1.7",
26-
"@truffle/debug-utils": "^4.0.4",
27-
"@truffle/debugger": "^7.1.1",
28-
"@truffle/decoder": "^4.3.1",
29-
"@truffle/deployer": "^3.1.17",
30-
"@truffle/environment": "^0.2.3",
26+
"@truffle/debug-utils": "^4.1.0",
27+
"@truffle/debugger": "^7.2.0",
28+
"@truffle/decoder": "^4.3.2",
29+
"@truffle/deployer": "^3.1.18",
30+
"@truffle/environment": "^0.2.4",
3131
"@truffle/error": "^0.0.8",
3232
"@truffle/expect": "^0.0.13",
3333
"@truffle/interface-adapter": "^0.4.6",
34-
"@truffle/migrate": "^3.1.17",
34+
"@truffle/migrate": "^3.1.18",
3535
"@truffle/provider": "^0.2.9",
3636
"@truffle/provisioner": "^0.2.0",
3737
"@truffle/require": "^2.0.39",
38-
"@truffle/resolver": "^5.1.10",
39-
"@truffle/workflow-compile": "^2.1.30",
38+
"@truffle/resolver": "^5.1.11",
39+
"@truffle/workflow-compile": "^2.1.31",
4040
"app-module-path": "^2.2.0",
4141
"async": "2.6.1",
4242
"bip39": "^2.2.0",

packages/debug-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@truffle/debug-utils",
3-
"version": "4.0.4",
3+
"version": "4.1.0",
44
"description": "Integration utils for truffle/debugger",
55
"dependencies": {
66
"@truffle/codec": "^0.5.1",

packages/debugger/package.json

Lines changed: 11 additions & 10 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": "7.1.1",
11+
"version": "7.2.0",
1212
"main": "dist/debugger.js",
1313
"scripts": {
1414
"build": "webpack --config webpack/webpack.config.js",
@@ -21,9 +21,9 @@
2121
},
2222
"dependencies": {
2323
"@truffle/codec": "^0.5.1",
24-
"@truffle/compile-solidity": "^4.3.1",
24+
"@truffle/compile-solidity": "^4.3.2",
2525
"@truffle/expect": "^0.0.13",
26-
"@truffle/solidity-utils": "^1.3.3",
26+
"@truffle/solidity-utils": "^1.3.4",
2727
"bn.js": "^4.11.8",
2828
"debug": "^4.1.0",
2929
"json-pointer": "^0.6.0",
@@ -42,12 +42,12 @@
4242
"web3-eth-abi": "1.2.1"
4343
},
4444
"devDependencies": {
45-
"@truffle/artifactor": "^4.0.56",
45+
"@truffle/artifactor": "^4.0.57",
4646
"@truffle/box": "^1.0.59",
47-
"@truffle/debug-utils": "^4.0.4",
48-
"@truffle/migrate": "^3.1.17",
49-
"@truffle/resolver": "^5.1.10",
50-
"@truffle/workflow-compile": "^2.1.30",
47+
"@truffle/debug-utils": "^4.1.0",
48+
"@truffle/migrate": "^3.1.18",
49+
"@truffle/resolver": "^5.1.11",
50+
"@truffle/workflow-compile": "^2.1.31",
5151
"babel-core": "^6.26.0",
5252
"babel-loader": "^7.1.2",
5353
"babel-plugin-transform-object-rest-spread": "^6.26.0",
@@ -65,10 +65,11 @@
6565
"ganache-core": "2.10.2",
6666
"istanbul-instrumenter-loader": "^3.0.1",
6767
"mocha": "5.2.0",
68-
"mocha-webpack": "^1.1.0",
68+
"mocha-webpack": "2.0.0-beta.0",
6969
"nyc": "^13.0.1",
7070
"remotedev-server": "^0.3.1",
71-
"webpack": "^3.8.1",
71+
"webpack": "^4.43.0",
72+
"webpack-cli": "^3.3.11",
7273
"webpack-dev-middleware": "^2.0.4",
7374
"webpack-merge": "^4.1.1",
7475
"webpack-node-externals": "^1.6.0",

packages/debugger/webpack/webpack.config-dev.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const merge = require("webpack-merge");
55
const commonConfig = require("./webpack.config-common.js");
66

77
const debuggerConfig = merge(commonConfig, {
8+
mode: "development",
89
plugins: [
910
new webpack.DefinePlugin({
1011
"process.env.NODE_ENV": JSON.stringify("development")
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
const webpack = require("webpack");
21
const merge = require("webpack-merge");
32

43
const commonConfig = require("./webpack.config-common.js");
54

65
const debuggerConfig = merge(commonConfig, {
7-
plugins: [
8-
new webpack.DefinePlugin({
9-
"process.env.NODE_ENV": JSON.stringify("production")
10-
})
11-
]
6+
mode: "production"
127
});
138

149
module.exports = debuggerConfig;

packages/decoder/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@truffle/decoder",
3-
"version": "4.3.1",
3+
"version": "4.3.2",
44
"description": "A decoder and encoder for Solidity variables of all sorts",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",
@@ -15,8 +15,8 @@
1515
},
1616
"dependencies": {
1717
"@truffle/codec": "^0.5.1",
18-
"@truffle/compile-solidity": "^4.3.1",
19-
"@truffle/solidity-utils": "^1.3.3",
18+
"@truffle/compile-solidity": "^4.3.2",
19+
"@truffle/solidity-utils": "^1.3.4",
2020
"bn.js": "^4.11.8",
2121
"debug": "^4.1.0",
2222
"source-map-support": "^0.5.16",

0 commit comments

Comments
 (0)