Merge branch 'master' into contentBasePrependPublic

webpack · Dec 4, 2019 · cd96602 · cd96602
2 parents 1a69983 + bd6783a
commit cd96602
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/lib/utils/normalizeOptions.js b/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) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.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",