Merge in develop branch

Author: eggplantzzz

packages/artifactor/package.json

@@ -5,7 +5,7 @@
  "license": "MIT",
  "author": "Tim Coulter",
  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/artifactor",
- "version": "4.0.33",
+ "version": "4.0.35",
  "main": "dist/index.js",
  "scripts": {
  "build": "tsc",
@@ -18,7 +18,7 @@
  "lodash": "^4.17.13"
  },
  "devDependencies": {
- "@truffle/contract": "^4.0.34",
+ "@truffle/contract": "^4.0.36",
  "@types/fs-extra": "^8.0.0",
  "@types/node": "^12.6.2",
  "chai": "4.2.0",

packages/box/package.json

@@ -4,7 +4,7 @@
  "license": "MIT",
  "author": "g. nicholas d'andrea <gnidan@trufflesuite.com>",
  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/box",
- "version": "1.0.39",
+ "version": "1.0.42",
  "main": "dist/box.js",
  "scripts": {
  "build": "tsc",
@@ -13,7 +13,7 @@
  },
  "types": "./typings/index.d.ts",
  "dependencies": {
- "@truffle/config": "^1.2.0",
+ "@truffle/config": "^1.2.2",
  "fs-extra": "6.0.1",
  "github-download": "^0.5.0",
  "inquirer": "^7.0.0",
@@ -25,7 +25,7 @@
  },
  "devDependencies": {
  "@types/fs-extra": "^8.0.0",
- "@types/inquirer": "^6.0.3",
+ "@types/inquirer": "6.0.3",
  "@types/request-promise-native": "^1.0.16",
  "@types/tmp": "^0.1.0",
  "mocha": "5.2.0",

packages/code-utils/package.json

@@ -4,7 +4,7 @@
  "license": "MIT",
  "author": "",
  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/code-utils",
- "version": "1.2.8",
+ "version": "1.2.9",
  "main": "dist/index.js",
  "scripts": {
  "build": "tsc",

packages/code-utils/tsconfig.json

@@ -19,8 +19,8 @@
  "typeRoots": [
  "./typings",
  "node_modules/@types",
- "../../**/node_modules/@types/mocha",
- "../../**/node_modules/@types/node"
+ "../../node_modules/@types/mocha",
+ "../../node_modules/@types/node"
  ]
  },
  "include": [

packages/compile-solidity/package.json

@@ -1,10 +1,10 @@
 {
  "name": "@truffle/compile-solidity",
  "description": "Compiler helper and artifact manager for Solidity files",
- "version": "4.2.6",
+ "version": "4.2.8",
  "main": "index.js",
  "dependencies": {
- "@truffle/config": "^1.2.0",
+ "@truffle/config": "^1.2.2",
  "@truffle/contract-sources": "^0.1.6",
  "@truffle/error": "^0.0.7",
  "@truffle/expect": "^0.0.11",

packages/compile-solidity/run.js

@@ -331,6 +331,7 @@ function processContracts({
  originalSourcePaths,
  solcVersion
 }) {
+ if (!compilerOutput.contracts) return [];
  return (
  Object.entries(compilerOutput.contracts)
  // map to [[{ source, contractName, contract }]]

packages/compile-vyper/package.json

@@ -4,20 +4,20 @@
  "license": "MIT",
  "author": "Evgeniy Filatov <evgeniyfilatov@gmail.com>",
  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/compile-vyper",
- "version": "1.0.30",
+ "version": "1.0.32",
  "main": "index.js",
  "scripts": {
  "test": "mocha"
  },
  "dependencies": {
- "@truffle/compile-solidity": "^4.2.6",
+ "@truffle/compile-solidity": "^4.2.8",
  "async": "2.6.1",
  "colors": "^1.1.2",
  "eslint": "^5.5.0",
  "minimatch": "^3.0.4"
  },
  "devDependencies": {
- "@truffle/config": "^1.2.0",
+ "@truffle/config": "^1.2.2",
  "mocha": "5.2.0"
  },
  "keywords": [

packages/config/.gitignore

@@ -1,3 +1,4 @@
 node_modules
 yarn.lock
 package-lock.json
+dist

packages/config/index.js

@@ -1,11 +1,13 @@
 {
  "name": "@truffle/config",
- "version": "1.2.0",
+ "version": "1.2.2",
  "description": "Utility for interacting with truffle-config.js files",
- "main": "index.js",
- "typings": "./typings/index.d.ts",
+ "main": "dist/index.js",
+ "types": "dist/index.d.ts",
  "scripts": {
- "test": "mocha"
+ "build": "tsc",
+ "prepare": "yarn build",
+ "test": "yarn build && mocha --exit -r ts-node/register test/**/*.test.ts"
  },
  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/config",
  "keywords": [
@@ -19,18 +21,26 @@
  "url": "https://github.com/trufflesuite/truffle/issues"
  },
  "homepage": "https://github.com/trufflesuite/truffle/tree/master/packages/config#readme",
+ "devDependencies": {
+ "@types/configstore": "^4.0.0",
+ "@types/find-up": "^2.1.0",
+ "@types/node": "^12.7.7",
+ "@types/sinon": "^7.0.13",
+ "mocha": "6.2.0",
+ "sinon": "^7.5.0",
+ "ts-node": "^8.4.1",
+ "typescript": "^3.6.3"
+ },
  "dependencies": {
  "@truffle/error": "^0.0.7",
  "@truffle/provider": "^0.1.18",
  "configstore": "^4.0.0",
  "find-up": "^2.1.0",
  "lodash": "^4.17.13",
+ "module": "^1.2.5",
  "original-require": "1.0.1"
  },
  "publishConfig": {
  "access": "public"
- },
- "devDependencies": {
- "mocha": "5.2.0"
  }
 }