fix(build): fixed broken build

postalsys · Feb 3, 2024 · ae43242 · ae43242
1 parent 563c106
commit ae43242
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 67 deletions.
diff --git a/lib/routes-ui.js b/lib/routes-ui.js
@@ -37,7 +37,6 @@ const { ADDRESS_STRATEGIES, settingsSchema, templateSchemas, oauthCreateSchema,
 const fs = require('fs');
 const pathlib = require('path');
 const timezonesList = require('timezones-list').default;
-const beautifyHtml = require('js-beautify').html;
 const { Client: ElasticSearch } = require('@elastic/elasticsearch');
 const { templates } = require('./templates');
 const { webhooks } = require('./webhooks');
@@ -1241,12 +1240,6 @@ function applyRoutes(server, call) {
                     deliveryAttempts: request.payload.deliveryAttempts
                 };
 
-                try {
-                    data.templateHeader = data.templateHeader ? beautifyHtml(data.templateHeader, {}) : data.templateHeader;
-                } catch (err) {
-                    request.logger.error({ msg: 'Failed to preprocess provided HTML', err, html: request.payload.templateHeader });
-                }
-
                 if (request.payload.serviceUrl) {
                     let url = new URL(request.payload.serviceUrl);
                     data.serviceUrl = url.origin;

diff --git a/package.json b/package.json
@@ -81,7 +81,6 @@
         "ipaddr.js": "2.1.0",
         "joi": "17.12.1",
         "jquery": "3.7.1",
-        "js-beautify": "1.14.11",
         "libbase64": "1.2.1",
         "libmime": "5.2.1",
         "libqp": "2.0.1",
@@ -141,6 +140,7 @@
             "node_modules/bull/lib/commands/**/*",
             "node_modules/swagger-ui-dist/**/*",
             "translations/**/*",
+            "node_modules/@postalsys/joi-messages/translations/*",
             "LICENSE_EMAILENGINE.txt",
             "help.txt",
             "version-info.json",

diff --git a/sbom.json b/sbom.json
diff --git a/static/licenses.html b/static/licenses.html
@@ -1,6 +1,6 @@
 <!doctype html><html><head><meta charset="utf-8"><title>EmailEngine Licenses</title><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous"></head><body>
 <div class="container-fluid">
-<h1>EmailEngine v2.39.7</h1><p>EmailEngine includes code from the following software packages:</p>
+<h1>EmailEngine v2.39.8</h1><p>EmailEngine includes code from the following software packages:</p>
 <table class="table table-sm">
 <tr><thead class="thead-dark"><th>Package</th><th>Version</th><th>License</th><th>Publisher</th><th>Publisher's Email</th><th>Package URL</th></tr>
 <tbody>
@@ -1325,16 +1325,6 @@ <h1>EmailEngine v2.39.7</h1><p>EmailEngine includes code from the following soft
 </td
 </tr>
 <tr>
-<td><a href="https://npmjs.com/package/abbrev">abbrev</a></td>
-<td>2.0.0</td>
-<td>ISC</td>
-<td>GitHub Inc.</td>
-<td></td>
-<td>
-<a href="https://github.com/npm/abbrev-js">github.com/npm/abbrev-js</a>
-</td
-</tr>
-<tr>
 <td><a href="https://npmjs.com/package/abort-controller">abort-controller</a></td>
 <td>3.0.0</td>
 <td>MIT</td>
@@ -5165,16 +5155,6 @@ <h1>EmailEngine v2.39.7</h1><p>EmailEngine includes code from the following soft
 </tr>
 <tr>
 <td><a href="https://npmjs.com/package/js-beautify">js-beautify</a></td>
-<td>1.14.11</td>
-<td>MIT</td>
-<td>Einar Lielmanis</td>
-<td>[email protected]</td>
-<td>
-<a href="https://github.com/beautify-web/js-beautify">github.com/beautify-web/js-beautify</a>
-</td
-</tr>
-<tr>
-<td><a href="https://npmjs.com/package/js-beautify">js-beautify</a></td>
 <td>1.14.9</td>
 <td>MIT</td>
 <td>Einar Lielmanis</td>
@@ -6684,16 +6664,6 @@ <h1>EmailEngine v2.39.7</h1><p>EmailEngine includes code from the following soft
 </td
 </tr>
 <tr>
-<td><a href="https://npmjs.com/package/nopt">nopt</a></td>
-<td>7.2.0</td>
-<td>ISC</td>
-<td>GitHub Inc.</td>
-<td></td>
-<td>
-<a href="https://github.com/npm/nopt">github.com/npm/nopt</a>
-</td
-</tr>
-<tr>
 <td><a href="https://npmjs.com/package/normalize-package-data">normalize-package-data</a></td>
 <td>2.5.0</td>
 <td>BSD-2-Clause</td>

diff --git a/translations/messages.pot b/translations/messages.pot
@@ -1,7 +1,17 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=ascii\n"
-"POT-Creation-Date: 2024-02-02 12:31+0000\n"
+"POT-Creation-Date: 2024-02-03 02:09+0000\n"
+
+#: views/config/license.hbs:48
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: views/redirect.hbs:1
+msgid "Click <a href=\"%s\">here</a> to continue&mldr;"
+msgstr ""
 
 #: views/unsubscribe.hbs:1
 #: views/unsubscribe.hbs:79
@@ -47,16 +57,6 @@ msgstr ""
 msgid "Enter your email address"
 msgstr ""
 
-#: views/redirect.hbs:1
-msgid "Click <a href=\"%s\">here</a> to continue&mldr;"
-msgstr ""
-
-#: views/config/license.hbs:48
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-
 #: views/accounts/register/imap.hbs:11
 msgid "Your name"
 msgstr ""
@@ -189,40 +189,40 @@ msgstr ""
 msgid "Standard IMAP"
 msgstr ""
 
-#: lib/routes-ui.js:603
+#: lib/routes-ui.js:602
 msgid "Invalid API key for OpenAI"
 msgstr ""
 
-#: lib/routes-ui.js:4630
-#: lib/routes-ui.js:6553
-#: lib/routes-ui.js:6564
+#: lib/routes-ui.js:4623
+#: lib/routes-ui.js:6546
+#: lib/routes-ui.js:6557
 msgid "Server hostname was not found"
 msgstr ""
 
-#: lib/routes-ui.js:4633
-#: lib/routes-ui.js:6556
-#: lib/routes-ui.js:6567
+#: lib/routes-ui.js:4626
+#: lib/routes-ui.js:6549
+#: lib/routes-ui.js:6560
 msgid "Invalid username or password"
 msgstr ""
 
-#: lib/routes-ui.js:4637
-#: lib/routes-ui.js:6571
+#: lib/routes-ui.js:4630
+#: lib/routes-ui.js:6564
 msgid "TLS protocol error"
 msgstr ""
 
-#: lib/routes-ui.js:6365
-#: lib/routes-ui.js:6405
-#: lib/routes-ui.js:9105
+#: lib/routes-ui.js:6358
+#: lib/routes-ui.js:6398
+#: lib/routes-ui.js:9098
 msgid "Failed to validate request arguments"
 msgstr ""
 
-#: lib/routes-ui.js:6491
-#: lib/routes-ui.js:6747
+#: lib/routes-ui.js:6484
+#: lib/routes-ui.js:6740
 msgid "Failed to process account"
 msgstr ""
 
-#: lib/routes-ui.js:9205
-#: lib/routes-ui.js:9238
+#: lib/routes-ui.js:9198
+#: lib/routes-ui.js:9231
 msgid "Failed to process request"
 msgstr ""