diff --git a/client/src/view-helper.js b/client/src/view-helper.js index 3b4a6f58b4..ac6d0fab92 100644 --- a/client/src/view-helper.js +++ b/client/src/view-helper.js @@ -374,10 +374,10 @@ define('view-helper', ['lib!marked', 'lib!dompurify'], function (marked, DOMPuri options = options || {}; if (options.inline) { - text = marked.inlineLexer(text, []); + text = marked.parseInline(text); } else { - text = marked(text); + text = marked.parse(text); } text = DOMPurify.sanitize(text).toString(); diff --git a/client/src/views/notification/items/message.js b/client/src/views/notification/items/message.js index 6fd776f2d2..5a1d69a785 100644 --- a/client/src/views/notification/items/message.js +++ b/client/src/views/notification/items/message.js @@ -46,7 +46,7 @@ define( this.style = data.style || 'text-muted'; - let message = marked( + let message = marked.parse( (this.model.get('message') || data.message || '') ); diff --git a/frontend/libs.json b/frontend/libs.json index 5959722cb6..c7716cd559 100644 --- a/frontend/libs.json +++ b/frontend/libs.json @@ -60,7 +60,7 @@ "bundle": true }, { - "src": "node_modules/marked/lib/marked.js", + "src": "node_modules/marked/lib/marked.umd.js", "bundle": true }, { diff --git a/package-lock.json b/package-lock.json index 77ca4acbc6..ab77b57134 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12202,9 +12202,9 @@ } }, "marked": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz", - "integrity": "sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==" + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz", + "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==" }, "maxmin": { "version": "2.1.0", diff --git a/package.json b/package.json index d743a59d2f..1796318255 100644 --- a/package.json +++ b/package.json @@ -35,8 +35,6 @@ "trim-newlines": "^4.0.1" }, "dependencies": { - "getobject": ">=1.0.0", - "set-value": ">=4.0.1", "ace-builds": "^1.4.12", "autobahn-espo": "git://github.com/yurikuzn/autobahn-espo.git#0.1.0", "backbone": "^1.3.3", @@ -54,6 +52,7 @@ "exif-js": "^2.3.0", "flotr2": "git://github.com/yurikuzn/flotr2.git#0.1.0", "fullcalendar": "^3.10.2", + "getobject": ">=1.0.0", "gridstack": "^1.2.1", "handlebars": "^4.7.7", "jquery": "^3.6.0", @@ -61,12 +60,13 @@ "jquery-ui-espo": "git://github.com/yurikuzn/jquery-ui-espo.git#0.2.0", "jquery-ui-touch-punch": "^0.2.3", "jsbarcode": "^3.11.4", - "marked": "^0.8.2", + "marked": "^4.0.10", "moment": "^2.24.0", "moment-timezone": "^0.5.33", "moment-timezone-data-build": "git://github.com/yurikuzn/moment-timezone-data-build.git#0.1.0", "qrcodejs": "^1.0.0", "selectize": "git://github.com/selectize/selectize.js.git#v0.13.3", + "set-value": ">=4.0.1", "summernote": "^0.8.18", "timepicker": "^1.11.15", "underscore": "^1.13.1",