webpack upgrade

build/webpack.app.config.js

@@ -1,5 +1,5 @@
 const path = require("path");
-const merge = require("webpack-merge");
+const { merge } = require("webpack-merge");
 const base = require("./webpack.base.config");
 
 module.exports = env => {

build/webpack.base.config.js

@@ -3,6 +3,10 @@ const nodeExternals = require("webpack-node-externals");
 const FriendlyErrorsWebpackPlugin = require("friendly-errors-webpack-plugin");
 
 module.exports = env => {
+  if(env && env.test)
+    env = 'test'
+  else if(env && env.production)
+    env = 'production'
   return {
     mode: env == 'test' ? 'production' : (env || 'development'),
     target: "node",

build/webpack.tests.config.js

@@ -1,4 +1,4 @@
-const merge = require("webpack-merge");
+const { merge } = require("webpack-merge");
 const jetpack = require("fs-jetpack");
 const base = require("./webpack.base.config");