Skip to content

Commit ae43242

Browse files
andris9andris9
committed
fix(build): fixed broken build
1 parent 563c106 commit ae43242

File tree

5 files changed

+30
-67
lines changed

5 files changed

+30
-67
lines changed

‎lib/routes-ui.js

-7
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ const { ADDRESS_STRATEGIES, settingsSchema, templateSchemas, oauthCreateSchema,
3737
const fs = require('fs');
3838
const pathlib = require('path');
3939
const timezonesList = require('timezones-list').default;
40-
const beautifyHtml = require('js-beautify').html;
4140
const { Client: ElasticSearch } = require('@elastic/elasticsearch');
4241
const { templates } = require('./templates');
4342
const { webhooks } = require('./webhooks');
@@ -1241,12 +1240,6 @@ function applyRoutes(server, call) {
12411240
deliveryAttempts: request.payload.deliveryAttempts
12421241
};
12431242

1244-
try {
1245-
data.templateHeader = data.templateHeader ? beautifyHtml(data.templateHeader, {}) : data.templateHeader;
1246-
} catch (err) {
1247-
request.logger.error({ msg: 'Failed to preprocess provided HTML', err, html: request.payload.templateHeader });
1248-
}
1249-
12501243
if (request.payload.serviceUrl) {
12511244
let url = new URL(request.payload.serviceUrl);
12521245
data.serviceUrl = url.origin;

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
"ipaddr.js": "2.1.0",
8282
"joi": "17.12.1",
8383
"jquery": "3.7.1",
84-
"js-beautify": "1.14.11",
8584
"libbase64": "1.2.1",
8685
"libmime": "5.2.1",
8786
"libqp": "2.0.1",
@@ -141,6 +140,7 @@
141140
"node_modules/bull/lib/commands/**/*",
142141
"node_modules/swagger-ui-dist/**/*",
143142
"translations/**/*",
143+
"node_modules/@postalsys/joi-messages/translations/*",
144144
"LICENSE_EMAILENGINE.txt",
145145
"help.txt",
146146
"version-info.json",

‎sbom.json

+1-1
Large diffs are not rendered by default.

‎static/licenses.html

+1-31
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!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>
22
<div class="container-fluid">
3-
<h1>EmailEngine v2.39.7</h1><p>EmailEngine includes code from the following software packages:</p>
3+
<h1>EmailEngine v2.39.8</h1><p>EmailEngine includes code from the following software packages:</p>
44
<table class="table table-sm">
55
<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>
66
<tbody>
@@ -1325,16 +1325,6 @@ <h1>EmailEngine v2.39.7</h1><p>EmailEngine includes code from the following soft
13251325
</td
13261326
</tr>
13271327
<tr>
1328-
<td><a href="https://npmjs.com/package/abbrev">abbrev</a></td>
1329-
<td>2.0.0</td>
1330-
<td>ISC</td>
1331-
<td>GitHub Inc.</td>
1332-
<td></td>
1333-
<td>
1334-
<a href="https://github.com/npm/abbrev-js">github.com/npm/abbrev-js</a>
1335-
</td
1336-
</tr>
1337-
<tr>
13381328
<td><a href="https://npmjs.com/package/abort-controller">abort-controller</a></td>
13391329
<td>3.0.0</td>
13401330
<td>MIT</td>
@@ -5165,16 +5155,6 @@ <h1>EmailEngine v2.39.7</h1><p>EmailEngine includes code from the following soft
51655155
</tr>
51665156
<tr>
51675157
<td><a href="https://npmjs.com/package/js-beautify">js-beautify</a></td>
5168-
<td>1.14.11</td>
5169-
<td>MIT</td>
5170-
<td>Einar Lielmanis</td>
5171-
<td>[email protected]</td>
5172-
<td>
5173-
<a href="https://github.com/beautify-web/js-beautify">github.com/beautify-web/js-beautify</a>
5174-
</td
5175-
</tr>
5176-
<tr>
5177-
<td><a href="https://npmjs.com/package/js-beautify">js-beautify</a></td>
51785158
<td>1.14.9</td>
51795159
<td>MIT</td>
51805160
<td>Einar Lielmanis</td>
@@ -6684,16 +6664,6 @@ <h1>EmailEngine v2.39.7</h1><p>EmailEngine includes code from the following soft
66846664
</td
66856665
</tr>
66866666
<tr>
6687-
<td><a href="https://npmjs.com/package/nopt">nopt</a></td>
6688-
<td>7.2.0</td>
6689-
<td>ISC</td>
6690-
<td>GitHub Inc.</td>
6691-
<td></td>
6692-
<td>
6693-
<a href="https://github.com/npm/nopt">github.com/npm/nopt</a>
6694-
</td
6695-
</tr>
6696-
<tr>
66976667
<td><a href="https://npmjs.com/package/normalize-package-data">normalize-package-data</a></td>
66986668
<td>2.5.0</td>
66996669
<td>BSD-2-Clause</td>

‎translations/messages.pot

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
msgid ""
22
msgstr ""
33
"Content-Type: text/plain; charset=ascii\n"
4-
"POT-Creation-Date: 2024-02-02 12:31+0000\n"
4+
"POT-Creation-Date: 2024-02-03 02:09+0000\n"
5+
6+
#: views/config/license.hbs:48
7+
msgid "%d day"
8+
msgid_plural "%d days"
9+
msgstr[0] ""
10+
msgstr[1] ""
11+
12+
#: views/redirect.hbs:1
13+
msgid "Click <a href=\"%s\">here</a> to continue&mldr;"
14+
msgstr ""
515

616
#: views/unsubscribe.hbs:1
717
#: views/unsubscribe.hbs:79
@@ -47,16 +57,6 @@ msgstr ""
4757
msgid "Enter your email address"
4858
msgstr ""
4959

50-
#: views/redirect.hbs:1
51-
msgid "Click <a href=\"%s\">here</a> to continue&mldr;"
52-
msgstr ""
53-
54-
#: views/config/license.hbs:48
55-
msgid "%d day"
56-
msgid_plural "%d days"
57-
msgstr[0] ""
58-
msgstr[1] ""
59-
6060
#: views/accounts/register/imap.hbs:11
6161
msgid "Your name"
6262
msgstr ""
@@ -189,40 +189,40 @@ msgstr ""
189189
msgid "Standard IMAP"
190190
msgstr ""
191191

192-
#: lib/routes-ui.js:603
192+
#: lib/routes-ui.js:602
193193
msgid "Invalid API key for OpenAI"
194194
msgstr ""
195195

196-
#: lib/routes-ui.js:4630
197-
#: lib/routes-ui.js:6553
198-
#: lib/routes-ui.js:6564
196+
#: lib/routes-ui.js:4623
197+
#: lib/routes-ui.js:6546
198+
#: lib/routes-ui.js:6557
199199
msgid "Server hostname was not found"
200200
msgstr ""
201201

202-
#: lib/routes-ui.js:4633
203-
#: lib/routes-ui.js:6556
204-
#: lib/routes-ui.js:6567
202+
#: lib/routes-ui.js:4626
203+
#: lib/routes-ui.js:6549
204+
#: lib/routes-ui.js:6560
205205
msgid "Invalid username or password"
206206
msgstr ""
207207

208-
#: lib/routes-ui.js:4637
209-
#: lib/routes-ui.js:6571
208+
#: lib/routes-ui.js:4630
209+
#: lib/routes-ui.js:6564
210210
msgid "TLS protocol error"
211211
msgstr ""
212212

213-
#: lib/routes-ui.js:6365
214-
#: lib/routes-ui.js:6405
215-
#: lib/routes-ui.js:9105
213+
#: lib/routes-ui.js:6358
214+
#: lib/routes-ui.js:6398
215+
#: lib/routes-ui.js:9098
216216
msgid "Failed to validate request arguments"
217217
msgstr ""
218218

219-
#: lib/routes-ui.js:6491
220-
#: lib/routes-ui.js:6747
219+
#: lib/routes-ui.js:6484
220+
#: lib/routes-ui.js:6740
221221
msgid "Failed to process account"
222222
msgstr ""
223223

224-
#: lib/routes-ui.js:9205
225-
#: lib/routes-ui.js:9238
224+
#: lib/routes-ui.js:9198
225+
#: lib/routes-ui.js:9231
226226
msgid "Failed to process request"
227227
msgstr ""
228228

0 commit comments

Comments
 (0)