Merge branch 'master' into contentBasePrependPublic

Author: evilebottnawi

lib/utils/normalizeOptions.js

@@ -10,10 +10,7 @@ function normalizeOptions(compiler, options) {
     options.contentBase !== undefined ? options.contentBase : process.cwd();
 
   // Setup default value
-  options.contentBasePublicPath =
-    options.contentBasePublicPath !== undefined
-      ? options.contentBasePublicPath
-      : '/';
+  options.contentBasePublicPath = options.contentBasePublicPath || '/';
 
   // normalize transportMode option
   if (options.transportMode === undefined) {

package-lock.json

@@ -93,7 +93,7 @@
     "html-webpack-plugin": "^3.2.0",
     "husky": "^3.1.0",
     "jest": "^24.9.0",
-    "jest-junit": "^9.0.0",
+    "jest-junit": "^10.0.0",
     "jquery": "^3.4.1",
     "less": "^3.10.3",
     "less-loader": "^5.0.0",