Merge in develop branch

Author: eggplantzzz

packages/truffle/package.json

@@ -15,7 +15,7 @@
   "scripts": {
     "analyze": "./scripts/analyze.sh",
     "build": "yarn build-cli",
-    "build-cli": "webpack --config ./cli.webpack.config.js",
+    "build-cli": "NODE_OPTIONS='--max-old-space-size=4096' webpack --config ./webpack.config.js",
     "postinstall": "node ./scripts/postinstall.js",
     "prepare": "yarn build",
     "publish:byoc": "node ./scripts/prereleaseVersion.js byoc-safe byoc",
@@ -36,8 +36,8 @@
     "@truffle/core": "^5.1.23",
     "@truffle/debugger": "^7.2.0",
     "@truffle/interface-adapter": "^0.4.6",
-    "clean-webpack-plugin": "^0.1.16",
-    "copy-webpack-plugin": "^4.0.1",
+    "clean-webpack-plugin": "^3.0.0",
+    "copy-webpack-plugin": "^5.1.1",
     "eslint": "^5.7.0",
     "fs-extra": "^8.1.0",
     "ganache-core": "2.10.2",
@@ -47,14 +47,14 @@
     "meta-npm": "^0.0.22",
     "meta-pkgs": "^0.2.0",
     "nyc": "^13.0.1",
-    "prepend-file": "^1.3.1",
     "semver": "^5.6.0",
     "shebang-loader": "0.0.1",
     "stream-buffers": "^3.0.1",
     "tmp": "0.0.33",
     "web3": "1.2.1",
-    "webpack": "^3.12.0",
+    "webpack": "^4.43.0",
     "webpack-bundle-analyzer": "^3.0.3",
+    "webpack-cli": "^3.3.11",
     "yargs": "^8.0.2"
   },
   "publishConfig": {

packages/truffle/scripts/test.sh

@@ -13,5 +13,5 @@ elif [ "$COVERAGE" == true ]; then
 elif [ "$INTEGRATION" == true ]; then
   mocha --no-warnings --timeout 7000 --grep @geth --invert --colors $@
 else
-  yarn build-cli && mocha --no-warnings --timeout 7000 --grep @geth --invert --colors $@
+  yarn build && mocha --no-warnings --timeout 7000 --grep @geth --invert --colors $@
 fi

packages/truffle/cli.webpack.config.js packages/truffle/webpack.config.jspackages/truffle/cli.webpack.config.js renamed to packages/truffle/webpack.config.js

@@ -1,6 +1,6 @@
 const path = require("path");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
-const CleanWebpackPlugin = require("clean-webpack-plugin");
+const { CleanWebpackPlugin } = require("clean-webpack-plugin");
 const webpack = require("webpack");
 const pkg = require("./package.json");
 const rootDir = path.join(__dirname, "../..");
@@ -40,20 +40,23 @@ module.exports = {
       "index.js"
     )
   },
+
   target: "node",
   node: {
     // For this option, see here: https://github.com/webpack/webpack/issues/1599
     __dirname: false,
     __filename: false
   },
   context: rootDir,
+
   output: {
     path: outputDir,
     filename: "[name].bundled.js",
     library: "",
     libraryTarget: "commonjs"
   },
   devtool: "source-map",
+
   module: {
     rules: [
       // ignores "#!/bin..." lines inside files
@@ -67,13 +70,15 @@ module.exports = {
       }
     ]
   },
+
   externals: [
     // truffle-config uses the original-require module.
     // Here, we leave it as an external, and use the original-require
     // module that's a dependency of Truffle instead.
     /^original-require$/,
     /^mocha$/
   ],
+
   plugins: [
     new webpack.DefinePlugin({
       BUNDLE_VERSION: JSON.stringify(pkg.version),
@@ -279,11 +284,12 @@ module.exports = {
       }
     ]),
 
-    new CleanWebpackPlugin(["build"]),
+    new CleanWebpackPlugin(),
 
     // Make web3 1.0 packable
     new webpack.IgnorePlugin(/^electron$/)
   ],
+
   resolve: {
     alias: {
       "ws": path.join(__dirname, "./nil.js"),
@@ -299,6 +305,7 @@ module.exports = {
       "scrypt": "js-scrypt"
     }
   },
+
   stats: {
     warnings: false
   }