Merge branch 'release/v1.3.1'

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 Notable changes to Mailpit will be documented in this file.
 
+## v1.3.1
+
+### Bugfix
+- Append trailing slash to custom webroot for UI & API
+
+### Libs
+- Upgrade esbuild & axios
+
+### UI
+- Rename "results" to "result" when singular message returned
+
+
 ## v1.3.0
 
 ### Build

config/config.go

@@ -160,11 +160,12 @@ func VerifyConfig() error {
 		SMTPAuth = a
 	}
 
-	if strings.Contains(Webroot, " ") {
+	validWebrootRe := regexp.MustCompile(`[^0-9a-zA-Z\/-]`)
-		return fmt.Errorf("Webroot cannot contain spaces (%s)", Webroot)
+	if validWebrootRe.MatchString(Webroot) {
+		return fmt.Errorf("Invalid characters in Webroot (%s). Valid chars: a-z, A-Z, 0-9, - and /", Webroot)
 	}
 
-	s := path.Join("/", Webroot, "/")
+	s := strings.TrimRight(path.Join("/", Webroot, "/"), "/") + "/"
 	Webroot = s
 
 	SMTPTags = []Tag{}

package.json

@@ -8,7 +8,7 @@
     "package": "MINIFY=true node esbuild.config.js"
   },
   "dependencies": {
-    "axios": "^0.27.2",
+    "axios": "^1.2.1",
     "bootstrap": "^5.2.0",
     "bootstrap-icons": "^1.9.1",
     "bootstrap5-tags": "^1.4.41",
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@popperjs/core": "^2.11.5",
     "@vue/compiler-sfc": "^3.2.37",
-    "esbuild": "^0.14.50",
+    "esbuild": "^0.16.1",
     "esbuild-plugin-vue-next": "^0.1.4",
     "esbuild-sass-plugin": "^2.3.2"
   }

server/ui-src/App.vue

@@ -619,7 +619,7 @@ export default {
 				<option value="200">200</option>
 			</select>
 			<span v-if="searching">
-				<b>{{ formatNumber(items.length) }} results</b>
+				<b>{{ formatNumber(items.length) }} result<template v-if="items.length != 1">s</template></b>
 			</span>
 			<span v-else>
 				<small>

server/ui-src/mixins.js

@@ -63,16 +63,6 @@ const commonMixins = {
 			return new FakeModal();
 		},
 
-		// generic modal get/set function
-		offcanvas: function (id) {
-			var e = document.getElementById(id);
-			if (e) {
-				return bootstrap.Offcanvas.getOrCreateInstance(e);
-			}
-			// in case there are open/close actions
-			return new FakeModal();
-		},
-
 		/**
 		 * Axios GET request
 		 *