From b29076d0f30e7f673d2dd6488eae06e7b160facd Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Mon, 8 Jan 2018 14:25:07 -0200 Subject: [PATCH] Use correct verion of Mailparser module Since we are not using Node 4 anymore we do not need to use the mailperser fork, we can use the original one with Node 8 --- package-lock.json | 163 +++++++----------- package.json | 2 +- .../server/lib/interceptDirectReplyEmails.js | 2 +- 3 files changed, 61 insertions(+), 106 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9cd72042cbdc..f17a666d8a84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "0.60.0-develop", + "version": "0.61.0-develop", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -274,15 +274,6 @@ "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=", "dev": true }, - "array-includes": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", - "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", - "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.9.0" - } - }, "array-iterate": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.1.tgz", @@ -1589,11 +1580,6 @@ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, - "buffer-shims": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=" - }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", @@ -2558,6 +2544,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", + "dev": true, "requires": { "foreach": "2.0.5", "object-keys": "1.0.11" @@ -2764,28 +2751,6 @@ "stackframe": "0.3.1" } }, - "es-abstract": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz", - "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==", - "requires": { - "es-to-primitive": "1.1.1", - "function-bind": "1.1.1", - "has": "1.0.1", - "is-callable": "1.1.3", - "is-regex": "1.0.4" - } - }, - "es-to-primitive": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", - "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", - "requires": { - "is-callable": "1.1.3", - "is-date-object": "1.0.1", - "is-symbol": "1.0.1" - } - }, "es5-ext": { "version": "0.10.35", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz", @@ -3304,7 +3269,8 @@ "foreach": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", + "dev": true }, "forever-agent": { "version": "0.6.1", @@ -4277,7 +4243,8 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true }, "functional-red-black-tree": { "version": "1.0.1", @@ -4960,14 +4927,6 @@ "har-schema": "2.0.0" } }, - "has": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", - "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", - "requires": { - "function-bind": "1.1.1" - } - }, "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", @@ -5054,18 +5013,6 @@ "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=", "dev": true }, - "html-to-text": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-3.1.0.tgz", - "integrity": "sha1-fwfvIXPloEQecxXBkgE6AKUtXko=", - "requires": { - "he": "1.1.1", - "htmlparser2": "3.9.2", - "optimist": "0.6.1", - "underscore": "1.8.3", - "underscore.string": "3.3.4" - } - }, "htmlparser2": { "version": "3.9.2", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", @@ -5357,16 +5304,6 @@ "builtin-modules": "1.1.1" } }, - "is-callable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz", - "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=" - }, - "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" - }, "is-decimal": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz", @@ -5530,14 +5467,6 @@ "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", "dev": true }, - "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "requires": { - "has": "1.0.1" - } - }, "is-regexp": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", @@ -5576,11 +5505,6 @@ "integrity": "sha1-i1IMhfrnolM4LUsCZS4EVXbhO7g=", "dev": true }, - "is-symbol": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", - "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=" - }, "is-text-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", @@ -5925,6 +5849,14 @@ "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz", "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=" }, + "linkify-it": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz", + "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=", + "requires": { + "uc.micro": "1.0.3" + } + }, "load-json-file": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", @@ -6134,28 +6066,45 @@ "yallist": "2.1.2" } }, - "mailparser-node4": { - "version": "2.0.2-2", - "resolved": "https://registry.npmjs.org/mailparser-node4/-/mailparser-node4-2.0.2-2.tgz", - "integrity": "sha1-IK4hESKWWldb3a6bTADTwtgkR/U=", + "mailparser": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mailparser/-/mailparser-2.1.0.tgz", + "integrity": "sha512-K5aQPX8O4pXQYv2Lg2SZQnlL+XaI4VoyxcCveUVSt5VDTPokGRouX609zttWiBeDm1dwABw41eliFlaVt8FeUQ==", "requires": { "addressparser": "1.0.1", - "array-includes": "3.0.3", - "buffer-shims": "1.0.0", "he": "1.1.1", - "html-to-text": "3.1.0", - "iconv-lite": "0.4.15", + "html-to-text": "3.3.0", + "iconv-lite": "0.4.19", "libmime": "3.1.0", - "mailsplit-node4": "4.0.1", - "marked": "0.3.6" + "linkify-it": "2.0.3", + "mailsplit": "4.0.2", + "tlds": "1.197.0" + }, + "dependencies": { + "html-to-text": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-3.3.0.tgz", + "integrity": "sha1-aptjxpm4hbt7qEsURr/mh2u/z7c=", + "requires": { + "he": "1.1.1", + "htmlparser2": "3.9.2", + "optimist": "0.6.1", + "underscore": "1.8.3", + "underscore.string": "3.3.4" + } + }, + "iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" + } } }, - "mailsplit-node4": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/mailsplit-node4/-/mailsplit-node4-4.0.1.tgz", - "integrity": "sha1-XVEiiDVA/Ac/fQcWwv9ntlDP1oI=", + "mailsplit": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/mailsplit/-/mailsplit-4.0.2.tgz", + "integrity": "sha1-Kdy91XBbKe7LDr9PkFamiGosbf4=", "requires": { - "buffer-shims": "1.0.0", "libbase64": "0.1.0", "libmime": "3.1.0", "libqp": "1.1.0" @@ -6187,11 +6136,6 @@ "integrity": "sha1-Sz3ToTPRUYuO8NvHCb8qG0gkvIw=", "dev": true }, - "marked": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz", - "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=" - }, "mathml-tag-names": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.0.1.tgz", @@ -6640,7 +6584,8 @@ "object-keys": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", - "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=" + "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", + "dev": true }, "object.assign": { "version": "4.0.4", @@ -7167,7 +7112,7 @@ "postcss-custom-properties": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.2.0.tgz", - "integrity": "sha1-XZKafwbpuE4PETNBlMC6mjCs++k=", + "integrity": "sha512-eNR2h9T9ciKMoQEORrPjH33XeN/nuvVuxArOKmHtsFbGbNss631tgTrKou3/pmjAZbA4QQkhLIkPQkIk3WW+8w==", "dev": true, "requires": { "balanced-match": "1.0.0", @@ -9041,6 +8986,11 @@ "xtend": "4.0.1" } }, + "tlds": { + "version": "1.197.0", + "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.197.0.tgz", + "integrity": "sha512-zCyB24s6LWQV+qIhNnL/mODj5vpZhZYIOywuweXTsMet2yFgTtOQtjxxCcwTNtSiUj5wjWJLdi6BTn9EHwvfkA==" + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -9148,6 +9098,11 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, + "uc.micro": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz", + "integrity": "sha1-ftUNXg+an7ClczeSWfKndFjVAZI=" + }, "uglify-js": { "version": "2.8.29", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", diff --git a/package.json b/package.json index 209537f97100..0571c3fae069 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "imap": "^0.8.19", "jquery": "^3.2.1", "ldapjs": "^1.0.1", - "mailparser-node4": "^2.0.2-2", + "mailparser": "^2.1.0", "mime-db": "^1.32.0", "mime-type": "^3.0.5", "moment": "^2.20.1", diff --git a/packages/rocketchat-lib/server/lib/interceptDirectReplyEmails.js b/packages/rocketchat-lib/server/lib/interceptDirectReplyEmails.js index 815acf038db7..c7cde0bd5239 100644 --- a/packages/rocketchat-lib/server/lib/interceptDirectReplyEmails.js +++ b/packages/rocketchat-lib/server/lib/interceptDirectReplyEmails.js @@ -1,6 +1,6 @@ import IMAP from 'imap'; import POP3 from 'poplib'; -import { simpleParser } from 'mailparser-node4'; +import { simpleParser } from 'mailparser'; export class IMAPIntercepter { constructor() {