diff --git a/bin/upgrade/23.03/upgrade_fs.sh b/bin/upgrade/23.03/upgrade_fs.sh index 0f2f595700b..796c5c72b07 100644 --- a/bin/upgrade/23.03/upgrade_fs.sh +++ b/bin/upgrade/23.03/upgrade_fs.sh @@ -33,6 +33,11 @@ then #get web sdk countly update sdk-web + #use localhost instead of IPv4 local IP address to be IPv6 friendly + find /etc/nginx/ -type f -exec sed -i 's#http://127.0.0.1#http://localhost#g' {} + + nginx -t + nginx -s reload + if [ "$1" != "combined" ]; then countly upgrade; else diff --git a/package-lock.json b/package-lock.json index f8e083d9573..7b252f0cb71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "grunt-contrib-sass": "2.0.0", "grunt-contrib-uglify": "5.2.2", "icanhazip": "^1.0.3", - "jimp": "0.22.7", + "jimp": "0.22.8", "json2csv": "5.0.7", "jsonwebtoken": "9.0.0", "later": "1.2.0", @@ -54,7 +54,7 @@ "moment-timezone": "0.5.43", "mongodb": "4.9.1", "nginx-conf": "2.1.0", - "nodemailer": "6.9.1", + "nodemailer": "6.9.2", "object-hash": "3.0.0", "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git", "properties-parser": "0.3.1", @@ -1192,11 +1192,11 @@ } }, "node_modules/@jimp/bmp": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.22.7.tgz", - "integrity": "sha512-0cfBPvugURS7G+60vRBL+penDRst8x40alS5Rhn2nlGsgsBHljFDw7+H4o5r6gldw9nv9PR9JA90Wloy7KMZdQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.22.8.tgz", + "integrity": "sha512-JEMKgM1AEvvWfn9ZCHn62nK+QCE3Pb/ZhPdL3NF0ZgKNww6pqOmo6KqXzqY18JLB7c0epuTp4GPDPDhOh/ou1g==", "dependencies": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "bmp-js": "^0.1.0" }, "peerDependencies": { @@ -1204,11 +1204,11 @@ } }, "node_modules/@jimp/core": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.22.7.tgz", - "integrity": "sha512-lg4z+pw23v2Gp9LWQur0NqYtnmoNWnyN/Or96elhJgeEJskrDGwROdajortHCCOI1xDnUZSirg8sFvStC8BIlg==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.22.8.tgz", + "integrity": "sha512-vkN28aFikzQieA6bGxN+qe20pseCAemCyUI0YmRkJIArlb6OujtAwWAKyokv2lylV56bq8EQGIz+Y30OXUnRqg==", "dependencies": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "any-base": "^1.1.0", "buffer": "^5.2.0", "exif-parser": "^0.1.12", @@ -1234,19 +1234,19 @@ } }, "node_modules/@jimp/custom": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.22.7.tgz", - "integrity": "sha512-n+1+ZVDNumB1E+sL7KdGKAJ6MbgniX1/v/xOEFEQ46WDZ4cRTqP4+tXjHTuHSlOXiANH+K9zD6qgzqmgO6mCVw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.22.8.tgz", + "integrity": "sha512-u6lP9x/HNeGHB0Oojv4c2mhuDvn7G0ikzYbK4IKLsH4HzHxt62faMjBzQMcFhKJhR6UiiKE/jiHrhGvBT/fMkw==", "dependencies": { - "@jimp/core": "^0.22.7" + "@jimp/core": "^0.22.8" } }, "node_modules/@jimp/gif": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.22.7.tgz", - "integrity": "sha512-PGZMS8sYFnDcqg+t8IT3RaSJLrqB+3GzhI0hU5D4mmSuJ5UO/6Bdgu8nrwh3uFPxw0ZH6h9ozYk88cz0pKEhLQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.22.8.tgz", + "integrity": "sha512-I0l6koS67IPU40RPxCJTD1NvePEd8vUIHTejx1ly0jrjGnumbqdarAlBUkDrKfPPc+Fnqp84hBbSN1w5hNPT6w==", "dependencies": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "gifwrap": "^0.9.2", "omggif": "^1.0.9" }, @@ -1255,11 +1255,11 @@ } }, "node_modules/@jimp/jpeg": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.22.7.tgz", - "integrity": "sha512-ptwWyX/7RPcREy8SpPN/8IlywbwyPXiuXmoHwM6m4iKcyaCmmnfCdZwLNXYliJzFAFLLOWDuOrwO3cZSkH6Czg==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.22.8.tgz", + "integrity": "sha512-hLXrQ7/0QiUhAVAF10dfGCSq3hvyqjKltlpu/87b3wqMDKe9KdvhX1AJHiUUrAbJv1fAcnOmQGTyXGuySa1D6A==", "dependencies": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "jpeg-js": "^0.4.4" }, "peerDependencies": { @@ -1267,44 +1267,44 @@ } }, "node_modules/@jimp/plugin-blit": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.22.7.tgz", - "integrity": "sha512-8oXcBTSd/sBmTQATrCxQ1ZBER31Lge8vXzWqNCbC3b1ZvRggCcqnDzRRH1+JiI4i+jPRo3Fi6/sdvEUyQ5LY3g==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.22.8.tgz", + "integrity": "sha512-rQ19txVCKIwo74HtgFodFt4//0ATPCJK+f24riqzb+nx+1JaOo1xRvpJqg4moirHwKR2fhwdDxmY7KX20kCeYA==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-blur": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.22.7.tgz", - "integrity": "sha512-M+0I5CKFIpnIQE27j8o8NECBsOFBd4z7C95ydy2UohYopugFq+hSVtMs1D4pQgb0RW1DJPiXD/4PHqb+lzV5mA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.22.8.tgz", + "integrity": "sha512-GWbNK3YW6k2EKiGJdpAFEr0jezPBtiVxj2wG/lCPuWJz7KmzSSN99hQjIy73xQxoBCRdALfJlkhe3leFNRueSQ==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-circle": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.22.7.tgz", - "integrity": "sha512-zfZKKpOhlyiDeFjGW5JB9K4h/kvbdaAJWUEwmKrvvGar67G3j8dKu46AX0MeWRNZ1yk/lfz+JIa7TzKfxEBf6w==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.22.8.tgz", + "integrity": "sha512-qPCw8XFW8opT89ciFDuvs+eB3EB1mZIJWVajD2qAlprHiE7YGr34TkM7N5MNr3qZ1pJgkYdW6+HbBrJwBaonqw==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-color": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.22.7.tgz", - "integrity": "sha512-OXro9pdB0twQjV4LgW0bTEXaX1VgBsTBcFoDAs8q9mtQzD5p3UQmJ+ykCiQ5rTPxNN1Buc44tcCIfp8haB1ZVQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.22.8.tgz", + "integrity": "sha512-ogkbg6rpDVH/mMLgAQKg17z3oZE0VN7ZWxNoH12fUHchqKz1I57zpa65fxZe2I8T5Xz97HR3x+7V7oI8qQGdSA==", "dependencies": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "tinycolor2": "^1.6.0" }, "peerDependencies": { @@ -1312,11 +1312,11 @@ } }, "node_modules/@jimp/plugin-contain": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.22.7.tgz", - "integrity": "sha512-GwUxZp4jMA0O0qbknUPDONJAfHFaTRs8kK+jgRtUfgb1Xi96l5RN/PMMDv4owZCUiPVAON80X1BMj7nSQWNVUw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.22.8.tgz", + "integrity": "sha512-oiaPLdJt9Dk+XEEhM/OU3lFemM51mA9NgMCAdburSCjDzKacJYBGFSHjTOhXzcxOie/ZDpOYN/UzFGKy8Dgl9A==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -1326,11 +1326,11 @@ } }, "node_modules/@jimp/plugin-cover": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.22.7.tgz", - "integrity": "sha512-PVXeQyofGepMoJaQ5XapLwCcZfsOF1IoAotHosh8AOP8niCP/Erm8T6ZWf5tf0sMJiLHQMPUyns186H5isqEMQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.22.8.tgz", + "integrity": "sha512-mO68w1m/LhfuHU8LKHY05a4/hhWnY4t+T+8JCw9t+5yfzA4+LofBZZKtFtWgwf/QGe1y3X2rtUU/avAzDUKyyA==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -1340,55 +1340,55 @@ } }, "node_modules/@jimp/plugin-crop": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.22.7.tgz", - "integrity": "sha512-XXvUU+hPdodtTBSgyUJUnzh7JgKMVlS1GxjcQsjYU8iGr1dbpuazKMTQxc76ChVmy8ue4goi8bGstacWUHpl/Q==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.22.8.tgz", + "integrity": "sha512-ns4oH0h0gezYsbuH8RThcMLY5uTLk/vnqOVjWCehMHEzxi0DHMWCmpcb6bC//vJ+XFNhtVGn1ALN7+ROmPrj+A==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-displace": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.22.7.tgz", - "integrity": "sha512-CCNAkmm2OS4QQtNRfQvXqoAMxNE0maSlVEV5DNdioHOUKycy02EJ5hNYR3l0FG+NraQHOuqv9XV37sGRl6QzMA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.22.8.tgz", + "integrity": "sha512-Cj8nHYgsdFynOIx3dbbiVwRuZn3xO+RVfwkTRy0JBye+K2AU8SQJS+hSFNMQFTZt5djivh6kh0TzvR/6LkOd1w==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-dither": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.22.7.tgz", - "integrity": "sha512-ndCW5MIGMdh3aBvvgRCO7el9cIPG29kU7xQYlOs5+3JsDk3Vf7X30QGPjzxABOY95qLUNUjf5Qe/p/tqv/vbcw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.22.8.tgz", + "integrity": "sha512-oE0Us/6bEgrgEg56plU3jSBzvB9iGhweKUHmxYMWnQbFCHP4mNCtPAs8+Fmq6c+m98ZgBgRcrJTnC7lphHkGyw==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-fisheye": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.22.7.tgz", - "integrity": "sha512-boI1QowhZRfb6OF+ZPWtiSJP1GATsTHjd5Oy/lJ+n0L4rp439ZOTB1Elzcgc44O2C1mgZDdybRPQQvYdPF8slA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.22.8.tgz", + "integrity": "sha512-bWvYY/nfMcKclWEaRyAir+YsT6C5St823HUQAsewZowTrJmme+w4U2a6InsryTHUL01BBcV5BLH0aDHuV3StvA==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-flip": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.22.7.tgz", - "integrity": "sha512-/jkbgtvQPcKadAEV5ZXyoEpSdd7GEvGs/Ya/f48+LNszc+S24u4UXtuP3QPRJ5FHm0Re1t4uztM7xa6IPklAOA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.22.8.tgz", + "integrity": "sha512-0NFTNzjsdmOQkaIkNjZqO3/yU4SQb9nnWQXsLS1fFo+9QrIL5v8vVkXpk/rhiND6PyTj2mMTNjOa76GuZcC+iQ==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -1396,55 +1396,55 @@ } }, "node_modules/@jimp/plugin-gaussian": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.22.7.tgz", - "integrity": "sha512-OB1sdnjzq2rfUHmx9Rvi3SJIDbQAgWFgYEw6KhN3TSVOdrJHvwrQkEnwR9PoUzQg992VIpGcVc9Y1s/SOU2oCA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.22.8.tgz", + "integrity": "sha512-E/f14aLzCS50QAM7K+InI9V61KVy/Zx52vy7Jjfo1h7qKhQHss3PYaydaH0N6qlXRNeXgh+4/32P9JfieLMcdw==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-invert": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.22.7.tgz", - "integrity": "sha512-dX/TqACJ/M5uXDIEJlVPPwietMD6EWUeA/CV4uvhLz9EMjTgHociJ3TWqGCY/70phhIBLbhLcHUVBL/q65ynfQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.22.8.tgz", + "integrity": "sha512-UauP39FF2cwbA5VU+Tz9VlNa9rtULPSHZb0Huwcjqjm9/G/xVN69VJ8+RKiFC4zM1/kYAUp/6IRwPa6qdKJpSw==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-mask": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.22.7.tgz", - "integrity": "sha512-rfKHKJLAtJG7qbB4zYAMcQ9ue3CIFRuAJ3xX0lzCxC0fGvCVuXlcxiAEauBxqaTWqiKMnahqpR3/Ah679K2FKQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.22.8.tgz", + "integrity": "sha512-bhg5+3i8x1CmYj6cjvPBQZLwZEI3iK3gJWF25ZHF+12d3cqDuJngtr8oRQOQLlAgvKmrj9FXIiEPDczUI9cnWQ==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-normalize": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.22.7.tgz", - "integrity": "sha512-t8x2jjKDmvUAZB4Wbeagr4D0BvoVCIWquy94mpglvSZ8ujKLt0aQBl3CBEIbXFAoVqNif+G36NtxPHNsjxIXOg==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.22.8.tgz", + "integrity": "sha512-Yg5nreAR1JYuSObu3ExlgaLxVeW6VvjVL5qFwiPFxSNlG8JIwL1Ir3K3ChSnnvymyZvJMHb6YKTYNfXKw5Da6g==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-print": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.22.7.tgz", - "integrity": "sha512-kx0+cPeinki1IFg9cJy7LC4uVuOEOa8TIrcERioB6PVgJ7EDzCAfatTKULZ+t4uSs2K/lQF97wPYlbiyxs/Hzg==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.22.8.tgz", + "integrity": "sha512-86O5ejCDi543IYl0TykSmNWErzAjEYhiAxNQb2F7rFRT38WJYNVsvJ6QhxhDQHKxSmF5iwmqbk0jYk5Wp2Z1kw==", "dependencies": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "load-bmfont": "^1.4.1" }, "peerDependencies": { @@ -1453,22 +1453,22 @@ } }, "node_modules/@jimp/plugin-resize": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.22.7.tgz", - "integrity": "sha512-pg7i0JIYt7x7ag+CoD/yG70Xvwm1sKRfcFjQh954yestiin14uppPgXchAmTBmctecBjLNdsVlqSXbPvU4Jvxw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.22.8.tgz", + "integrity": "sha512-kg8ArQRPqv/iU3DWNXCa8kcVIhoq64Ze0aGCAeFLKlAq/59f5pzAci6m6vV4L/uOVdYmUa9/kYwIFY6RWKpfzQ==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" } }, "node_modules/@jimp/plugin-rotate": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.22.7.tgz", - "integrity": "sha512-Uh3Gb18IY8uXWk6E1bzMopum2GP+xwohbnMIDE0MSWmLaz7LXrfnvgXFba1uRGgn73CJz8UDS4fC1KIJMuxQZA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.22.8.tgz", + "integrity": "sha512-9a+VPZWMN/Cks76wf8LjM5RVA3ntP9+NAdsS1SZhhXel7U3Re/dWMouIEbo3QTt6K+igRo4txUCdZiw4ZucvkQ==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -1478,11 +1478,11 @@ } }, "node_modules/@jimp/plugin-scale": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.22.7.tgz", - "integrity": "sha512-3uHUrk5Rl6MCxuoJtHTSeJjSHIxHWqOOgmD2caKIvyxds0Zmofu/Fva+N4V/m80E4q4G2RXNsUplFpFGhUM7hw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.22.8.tgz", + "integrity": "sha512-dQS4pG6DX6endu8zUpvBBOEtGC+ljDDDNw0scSXY71TxyQdNo5Ro0apfsppjmuAr8rNotRkfyxbITKkXQDRUDQ==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -1490,11 +1490,11 @@ } }, "node_modules/@jimp/plugin-shadow": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.22.7.tgz", - "integrity": "sha512-NKEq5VR8U/d0OKf0hxFtrrbMCuNv7by31V+Kwgxb1oTP+j+zZEaww+m3YgEwIwRe7E8/yeDSHa5bJ+CmuyFZjw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.22.8.tgz", + "integrity": "sha512-HyAhr7OblTQh+BoKHQg4qbS9MweNlH77yfpBqUEyDtfyjI5r06+5chf1ZdLRIPEWv/BdCfdI/g81Wv69muCMwA==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -1503,11 +1503,11 @@ } }, "node_modules/@jimp/plugin-threshold": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.22.7.tgz", - "integrity": "sha512-BH4aLwfmnqjRVhdzMIqUns4ycZ6QoHHFR6Qz+X2iSpH5a33xFA4DRbd3Ehtrs4Gk7XiCjWkUyM6wjmH7l/1hNQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.22.8.tgz", + "integrity": "sha512-ZmkfH0PtjvF1UcKsjw0H7V6r+LC0yKzEfg76Jhs2nIqIgsxsSOVfHwS7z0/1IWnyXxSw36m+NjCAotNHRILGmA==", "dependencies": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -1516,31 +1516,31 @@ } }, "node_modules/@jimp/plugins": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.22.7.tgz", - "integrity": "sha512-AJmzTG/sa+CDpvle/UE89hjHR85gnRGSwLuQqPbhlY6GFCmC3uqHRJz9O5I8A4zdi9+e8LsBphuTlKV7RbuXOw==", - "dependencies": { - "@jimp/plugin-blit": "^0.22.7", - "@jimp/plugin-blur": "^0.22.7", - "@jimp/plugin-circle": "^0.22.7", - "@jimp/plugin-color": "^0.22.7", - "@jimp/plugin-contain": "^0.22.7", - "@jimp/plugin-cover": "^0.22.7", - "@jimp/plugin-crop": "^0.22.7", - "@jimp/plugin-displace": "^0.22.7", - "@jimp/plugin-dither": "^0.22.7", - "@jimp/plugin-fisheye": "^0.22.7", - "@jimp/plugin-flip": "^0.22.7", - "@jimp/plugin-gaussian": "^0.22.7", - "@jimp/plugin-invert": "^0.22.7", - "@jimp/plugin-mask": "^0.22.7", - "@jimp/plugin-normalize": "^0.22.7", - "@jimp/plugin-print": "^0.22.7", - "@jimp/plugin-resize": "^0.22.7", - "@jimp/plugin-rotate": "^0.22.7", - "@jimp/plugin-scale": "^0.22.7", - "@jimp/plugin-shadow": "^0.22.7", - "@jimp/plugin-threshold": "^0.22.7", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.22.8.tgz", + "integrity": "sha512-ieI2+kCpmIfjwVlT7B67ULCzxMizfj7LspJh9HnIZCDXQB9GBOZ9KImLYc75Krae0dP/3FR7FglLiSI7fkOHbw==", + "dependencies": { + "@jimp/plugin-blit": "^0.22.8", + "@jimp/plugin-blur": "^0.22.8", + "@jimp/plugin-circle": "^0.22.8", + "@jimp/plugin-color": "^0.22.8", + "@jimp/plugin-contain": "^0.22.8", + "@jimp/plugin-cover": "^0.22.8", + "@jimp/plugin-crop": "^0.22.8", + "@jimp/plugin-displace": "^0.22.8", + "@jimp/plugin-dither": "^0.22.8", + "@jimp/plugin-fisheye": "^0.22.8", + "@jimp/plugin-flip": "^0.22.8", + "@jimp/plugin-gaussian": "^0.22.8", + "@jimp/plugin-invert": "^0.22.8", + "@jimp/plugin-mask": "^0.22.8", + "@jimp/plugin-normalize": "^0.22.8", + "@jimp/plugin-print": "^0.22.8", + "@jimp/plugin-resize": "^0.22.8", + "@jimp/plugin-rotate": "^0.22.8", + "@jimp/plugin-scale": "^0.22.8", + "@jimp/plugin-shadow": "^0.22.8", + "@jimp/plugin-threshold": "^0.22.8", "timm": "^1.6.1" }, "peerDependencies": { @@ -1548,11 +1548,11 @@ } }, "node_modules/@jimp/png": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.22.7.tgz", - "integrity": "sha512-LxD3O9FKEwVv+j+HcUV7ez72Miy+823EjhtFZbBYXNp9qjHtHFBpgcSJBftUOCei8OlmmVgULYn9XjyfPsDgGw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.22.8.tgz", + "integrity": "sha512-XOj11kcCr8zKg24QSwlRfH9k4hbV6rkMGUVxMS3puRzzB0FBSQy42NBYEfYf2XlY2QJSAByPl4AYerOtKb805w==", "dependencies": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "pngjs": "^6.0.0" }, "peerDependencies": { @@ -1560,9 +1560,9 @@ } }, "node_modules/@jimp/tiff": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.22.7.tgz", - "integrity": "sha512-/oE8kLumzBfU1Z6h4TrDXYCGQNc4CjbZQvPssjImEqNLr5vbefpIpoy1fVMpsyuHZHsGovsBhBHxTJaRLO4+Og==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.22.8.tgz", + "integrity": "sha512-K0hYUVW5MLgwq3jiHVHa6LvP05J1rXOlRCC+5dMTUnAXVwi45+MKsqA/8lzzwhHYJ65CNhZwy6D3+ZNzM9SIBQ==", "dependencies": { "utif2": "^4.0.1" }, @@ -1571,15 +1571,15 @@ } }, "node_modules/@jimp/types": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.22.7.tgz", - "integrity": "sha512-1T8BxwDh5HJvBh3tt6HUd8r7ir5Ge3JWATXC8O3Y9QYwOaERjA2+FVhGSjtoo5xCeJvLRjSzEtfZ8heowMBL4w==", - "dependencies": { - "@jimp/bmp": "^0.22.7", - "@jimp/gif": "^0.22.7", - "@jimp/jpeg": "^0.22.7", - "@jimp/png": "^0.22.7", - "@jimp/tiff": "^0.22.7", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.22.8.tgz", + "integrity": "sha512-9+xc+mzuYwu0i+6dsnhXiUgfcS+Ktqn5q2jczoKyyBT0cOKgsk+57EIeFLgpTfVGRKRR0y/UIdHByeCzGguF3A==", + "dependencies": { + "@jimp/bmp": "^0.22.8", + "@jimp/gif": "^0.22.8", + "@jimp/jpeg": "^0.22.8", + "@jimp/png": "^0.22.8", + "@jimp/tiff": "^0.22.8", "timm": "^1.6.1" }, "peerDependencies": { @@ -1587,9 +1587,9 @@ } }, "node_modules/@jimp/utils": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.22.7.tgz", - "integrity": "sha512-4ax4IOWLIERx4yz9y3fNXKvQaPOY23yJF5h4sizxVkQUObkZHWE0kL0TVHodBt3rS8ksdbCL8Jkz4GeNP/Katg==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.22.8.tgz", + "integrity": "sha512-AaqjfqDeLzSFzrbGRKHMXg/ntiWKvoG9tpVgWzgOx5/gPWj/IyGfztojLTTvY8HqZCr25z8z91u2lAQD2v46Jw==", "dependencies": { "regenerator-runtime": "^0.13.3" } @@ -6632,13 +6632,13 @@ } }, "node_modules/jimp": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.22.7.tgz", - "integrity": "sha512-TJCTJ4ZcFUw6W8XZnR6ajdEu8vSyPi3AuoChs+zLHalXnhAPZgwkzwcXnxey4LNjh1p9dfIUkg8YSQ+q8pBW0A==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.22.8.tgz", + "integrity": "sha512-pBbrooJMX7795sDcxx1XpwNZC8B/ITyDV+JK2/1qNbQl/1UWqWeh5Dq7qQpMZl5jLdcFDv5IVTM+OhpafSqSFA==", "dependencies": { - "@jimp/custom": "^0.22.7", - "@jimp/plugins": "^0.22.7", - "@jimp/types": "^0.22.7", + "@jimp/custom": "^0.22.8", + "@jimp/plugins": "^0.22.8", + "@jimp/types": "^0.22.8", "regenerator-runtime": "^0.13.3" } }, @@ -8024,9 +8024,9 @@ "dev": true }, "node_modules/nodemailer": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.1.tgz", - "integrity": "sha512-qHw7dOiU5UKNnQpXktdgQ1d3OFgRAekuvbJLcdG5dnEo/GtcTHRYM7+UfJARdOFU9WUQO8OiIamgWPmiSFHYAA==", + "version": "6.9.2", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.2.tgz", + "integrity": "sha512-4+TYaa/e1nIxQfyw/WzNPYTEZ5OvHIDEnmjs4LPmIfccPQN+2CYKmGHjWixn/chzD3bmUTu5FMfpltizMxqzdg==", "engines": { "node": ">=6.0.0" } @@ -10597,9 +10597,9 @@ } }, "node_modules/utif2": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/utif2/-/utif2-4.0.1.tgz", - "integrity": "sha512-KMaD76dbzK1VjbwsckHJiqDjhP3pbpwyV+FdqkY6XFQenc2o/HS6pjPSYdu4+NQMHf2NLTW+nVP/eFP1CvOYQQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/utif2/-/utif2-4.1.0.tgz", + "integrity": "sha512-+oknB9FHrJ7oW7A2WZYajOcv4FcDR4CfoGB0dPNfxbi4GO05RRnFmt5oa23+9w32EanrYcSJWspUiJkLMs+37w==", "dependencies": { "pako": "^1.0.11" } @@ -12176,20 +12176,20 @@ "dev": true }, "@jimp/bmp": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.22.7.tgz", - "integrity": "sha512-0cfBPvugURS7G+60vRBL+penDRst8x40alS5Rhn2nlGsgsBHljFDw7+H4o5r6gldw9nv9PR9JA90Wloy7KMZdQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.22.8.tgz", + "integrity": "sha512-JEMKgM1AEvvWfn9ZCHn62nK+QCE3Pb/ZhPdL3NF0ZgKNww6pqOmo6KqXzqY18JLB7c0epuTp4GPDPDhOh/ou1g==", "requires": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "bmp-js": "^0.1.0" } }, "@jimp/core": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.22.7.tgz", - "integrity": "sha512-lg4z+pw23v2Gp9LWQur0NqYtnmoNWnyN/Or96elhJgeEJskrDGwROdajortHCCOI1xDnUZSirg8sFvStC8BIlg==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.22.8.tgz", + "integrity": "sha512-vkN28aFikzQieA6bGxN+qe20pseCAemCyUI0YmRkJIArlb6OujtAwWAKyokv2lylV56bq8EQGIz+Y30OXUnRqg==", "requires": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "any-base": "^1.1.0", "buffer": "^5.2.0", "exif-parser": "^0.1.12", @@ -12208,265 +12208,265 @@ } }, "@jimp/custom": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.22.7.tgz", - "integrity": "sha512-n+1+ZVDNumB1E+sL7KdGKAJ6MbgniX1/v/xOEFEQ46WDZ4cRTqP4+tXjHTuHSlOXiANH+K9zD6qgzqmgO6mCVw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.22.8.tgz", + "integrity": "sha512-u6lP9x/HNeGHB0Oojv4c2mhuDvn7G0ikzYbK4IKLsH4HzHxt62faMjBzQMcFhKJhR6UiiKE/jiHrhGvBT/fMkw==", "requires": { - "@jimp/core": "^0.22.7" + "@jimp/core": "^0.22.8" } }, "@jimp/gif": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.22.7.tgz", - "integrity": "sha512-PGZMS8sYFnDcqg+t8IT3RaSJLrqB+3GzhI0hU5D4mmSuJ5UO/6Bdgu8nrwh3uFPxw0ZH6h9ozYk88cz0pKEhLQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.22.8.tgz", + "integrity": "sha512-I0l6koS67IPU40RPxCJTD1NvePEd8vUIHTejx1ly0jrjGnumbqdarAlBUkDrKfPPc+Fnqp84hBbSN1w5hNPT6w==", "requires": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "gifwrap": "^0.9.2", "omggif": "^1.0.9" } }, "@jimp/jpeg": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.22.7.tgz", - "integrity": "sha512-ptwWyX/7RPcREy8SpPN/8IlywbwyPXiuXmoHwM6m4iKcyaCmmnfCdZwLNXYliJzFAFLLOWDuOrwO3cZSkH6Czg==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.22.8.tgz", + "integrity": "sha512-hLXrQ7/0QiUhAVAF10dfGCSq3hvyqjKltlpu/87b3wqMDKe9KdvhX1AJHiUUrAbJv1fAcnOmQGTyXGuySa1D6A==", "requires": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "jpeg-js": "^0.4.4" } }, "@jimp/plugin-blit": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.22.7.tgz", - "integrity": "sha512-8oXcBTSd/sBmTQATrCxQ1ZBER31Lge8vXzWqNCbC3b1ZvRggCcqnDzRRH1+JiI4i+jPRo3Fi6/sdvEUyQ5LY3g==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.22.8.tgz", + "integrity": "sha512-rQ19txVCKIwo74HtgFodFt4//0ATPCJK+f24riqzb+nx+1JaOo1xRvpJqg4moirHwKR2fhwdDxmY7KX20kCeYA==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-blur": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.22.7.tgz", - "integrity": "sha512-M+0I5CKFIpnIQE27j8o8NECBsOFBd4z7C95ydy2UohYopugFq+hSVtMs1D4pQgb0RW1DJPiXD/4PHqb+lzV5mA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.22.8.tgz", + "integrity": "sha512-GWbNK3YW6k2EKiGJdpAFEr0jezPBtiVxj2wG/lCPuWJz7KmzSSN99hQjIy73xQxoBCRdALfJlkhe3leFNRueSQ==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-circle": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.22.7.tgz", - "integrity": "sha512-zfZKKpOhlyiDeFjGW5JB9K4h/kvbdaAJWUEwmKrvvGar67G3j8dKu46AX0MeWRNZ1yk/lfz+JIa7TzKfxEBf6w==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.22.8.tgz", + "integrity": "sha512-qPCw8XFW8opT89ciFDuvs+eB3EB1mZIJWVajD2qAlprHiE7YGr34TkM7N5MNr3qZ1pJgkYdW6+HbBrJwBaonqw==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-color": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.22.7.tgz", - "integrity": "sha512-OXro9pdB0twQjV4LgW0bTEXaX1VgBsTBcFoDAs8q9mtQzD5p3UQmJ+ykCiQ5rTPxNN1Buc44tcCIfp8haB1ZVQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.22.8.tgz", + "integrity": "sha512-ogkbg6rpDVH/mMLgAQKg17z3oZE0VN7ZWxNoH12fUHchqKz1I57zpa65fxZe2I8T5Xz97HR3x+7V7oI8qQGdSA==", "requires": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "tinycolor2": "^1.6.0" } }, "@jimp/plugin-contain": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.22.7.tgz", - "integrity": "sha512-GwUxZp4jMA0O0qbknUPDONJAfHFaTRs8kK+jgRtUfgb1Xi96l5RN/PMMDv4owZCUiPVAON80X1BMj7nSQWNVUw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.22.8.tgz", + "integrity": "sha512-oiaPLdJt9Dk+XEEhM/OU3lFemM51mA9NgMCAdburSCjDzKacJYBGFSHjTOhXzcxOie/ZDpOYN/UzFGKy8Dgl9A==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-cover": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.22.7.tgz", - "integrity": "sha512-PVXeQyofGepMoJaQ5XapLwCcZfsOF1IoAotHosh8AOP8niCP/Erm8T6ZWf5tf0sMJiLHQMPUyns186H5isqEMQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.22.8.tgz", + "integrity": "sha512-mO68w1m/LhfuHU8LKHY05a4/hhWnY4t+T+8JCw9t+5yfzA4+LofBZZKtFtWgwf/QGe1y3X2rtUU/avAzDUKyyA==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-crop": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.22.7.tgz", - "integrity": "sha512-XXvUU+hPdodtTBSgyUJUnzh7JgKMVlS1GxjcQsjYU8iGr1dbpuazKMTQxc76ChVmy8ue4goi8bGstacWUHpl/Q==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.22.8.tgz", + "integrity": "sha512-ns4oH0h0gezYsbuH8RThcMLY5uTLk/vnqOVjWCehMHEzxi0DHMWCmpcb6bC//vJ+XFNhtVGn1ALN7+ROmPrj+A==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-displace": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.22.7.tgz", - "integrity": "sha512-CCNAkmm2OS4QQtNRfQvXqoAMxNE0maSlVEV5DNdioHOUKycy02EJ5hNYR3l0FG+NraQHOuqv9XV37sGRl6QzMA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.22.8.tgz", + "integrity": "sha512-Cj8nHYgsdFynOIx3dbbiVwRuZn3xO+RVfwkTRy0JBye+K2AU8SQJS+hSFNMQFTZt5djivh6kh0TzvR/6LkOd1w==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-dither": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.22.7.tgz", - "integrity": "sha512-ndCW5MIGMdh3aBvvgRCO7el9cIPG29kU7xQYlOs5+3JsDk3Vf7X30QGPjzxABOY95qLUNUjf5Qe/p/tqv/vbcw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.22.8.tgz", + "integrity": "sha512-oE0Us/6bEgrgEg56plU3jSBzvB9iGhweKUHmxYMWnQbFCHP4mNCtPAs8+Fmq6c+m98ZgBgRcrJTnC7lphHkGyw==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-fisheye": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.22.7.tgz", - "integrity": "sha512-boI1QowhZRfb6OF+ZPWtiSJP1GATsTHjd5Oy/lJ+n0L4rp439ZOTB1Elzcgc44O2C1mgZDdybRPQQvYdPF8slA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.22.8.tgz", + "integrity": "sha512-bWvYY/nfMcKclWEaRyAir+YsT6C5St823HUQAsewZowTrJmme+w4U2a6InsryTHUL01BBcV5BLH0aDHuV3StvA==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-flip": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.22.7.tgz", - "integrity": "sha512-/jkbgtvQPcKadAEV5ZXyoEpSdd7GEvGs/Ya/f48+LNszc+S24u4UXtuP3QPRJ5FHm0Re1t4uztM7xa6IPklAOA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.22.8.tgz", + "integrity": "sha512-0NFTNzjsdmOQkaIkNjZqO3/yU4SQb9nnWQXsLS1fFo+9QrIL5v8vVkXpk/rhiND6PyTj2mMTNjOa76GuZcC+iQ==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-gaussian": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.22.7.tgz", - "integrity": "sha512-OB1sdnjzq2rfUHmx9Rvi3SJIDbQAgWFgYEw6KhN3TSVOdrJHvwrQkEnwR9PoUzQg992VIpGcVc9Y1s/SOU2oCA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.22.8.tgz", + "integrity": "sha512-E/f14aLzCS50QAM7K+InI9V61KVy/Zx52vy7Jjfo1h7qKhQHss3PYaydaH0N6qlXRNeXgh+4/32P9JfieLMcdw==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-invert": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.22.7.tgz", - "integrity": "sha512-dX/TqACJ/M5uXDIEJlVPPwietMD6EWUeA/CV4uvhLz9EMjTgHociJ3TWqGCY/70phhIBLbhLcHUVBL/q65ynfQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.22.8.tgz", + "integrity": "sha512-UauP39FF2cwbA5VU+Tz9VlNa9rtULPSHZb0Huwcjqjm9/G/xVN69VJ8+RKiFC4zM1/kYAUp/6IRwPa6qdKJpSw==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-mask": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.22.7.tgz", - "integrity": "sha512-rfKHKJLAtJG7qbB4zYAMcQ9ue3CIFRuAJ3xX0lzCxC0fGvCVuXlcxiAEauBxqaTWqiKMnahqpR3/Ah679K2FKQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.22.8.tgz", + "integrity": "sha512-bhg5+3i8x1CmYj6cjvPBQZLwZEI3iK3gJWF25ZHF+12d3cqDuJngtr8oRQOQLlAgvKmrj9FXIiEPDczUI9cnWQ==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-normalize": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.22.7.tgz", - "integrity": "sha512-t8x2jjKDmvUAZB4Wbeagr4D0BvoVCIWquy94mpglvSZ8ujKLt0aQBl3CBEIbXFAoVqNif+G36NtxPHNsjxIXOg==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.22.8.tgz", + "integrity": "sha512-Yg5nreAR1JYuSObu3ExlgaLxVeW6VvjVL5qFwiPFxSNlG8JIwL1Ir3K3ChSnnvymyZvJMHb6YKTYNfXKw5Da6g==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-print": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.22.7.tgz", - "integrity": "sha512-kx0+cPeinki1IFg9cJy7LC4uVuOEOa8TIrcERioB6PVgJ7EDzCAfatTKULZ+t4uSs2K/lQF97wPYlbiyxs/Hzg==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.22.8.tgz", + "integrity": "sha512-86O5ejCDi543IYl0TykSmNWErzAjEYhiAxNQb2F7rFRT38WJYNVsvJ6QhxhDQHKxSmF5iwmqbk0jYk5Wp2Z1kw==", "requires": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "load-bmfont": "^1.4.1" } }, "@jimp/plugin-resize": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.22.7.tgz", - "integrity": "sha512-pg7i0JIYt7x7ag+CoD/yG70Xvwm1sKRfcFjQh954yestiin14uppPgXchAmTBmctecBjLNdsVlqSXbPvU4Jvxw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.22.8.tgz", + "integrity": "sha512-kg8ArQRPqv/iU3DWNXCa8kcVIhoq64Ze0aGCAeFLKlAq/59f5pzAci6m6vV4L/uOVdYmUa9/kYwIFY6RWKpfzQ==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-rotate": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.22.7.tgz", - "integrity": "sha512-Uh3Gb18IY8uXWk6E1bzMopum2GP+xwohbnMIDE0MSWmLaz7LXrfnvgXFba1uRGgn73CJz8UDS4fC1KIJMuxQZA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.22.8.tgz", + "integrity": "sha512-9a+VPZWMN/Cks76wf8LjM5RVA3ntP9+NAdsS1SZhhXel7U3Re/dWMouIEbo3QTt6K+igRo4txUCdZiw4ZucvkQ==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-scale": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.22.7.tgz", - "integrity": "sha512-3uHUrk5Rl6MCxuoJtHTSeJjSHIxHWqOOgmD2caKIvyxds0Zmofu/Fva+N4V/m80E4q4G2RXNsUplFpFGhUM7hw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.22.8.tgz", + "integrity": "sha512-dQS4pG6DX6endu8zUpvBBOEtGC+ljDDDNw0scSXY71TxyQdNo5Ro0apfsppjmuAr8rNotRkfyxbITKkXQDRUDQ==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-shadow": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.22.7.tgz", - "integrity": "sha512-NKEq5VR8U/d0OKf0hxFtrrbMCuNv7by31V+Kwgxb1oTP+j+zZEaww+m3YgEwIwRe7E8/yeDSHa5bJ+CmuyFZjw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.22.8.tgz", + "integrity": "sha512-HyAhr7OblTQh+BoKHQg4qbS9MweNlH77yfpBqUEyDtfyjI5r06+5chf1ZdLRIPEWv/BdCfdI/g81Wv69muCMwA==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugin-threshold": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.22.7.tgz", - "integrity": "sha512-BH4aLwfmnqjRVhdzMIqUns4ycZ6QoHHFR6Qz+X2iSpH5a33xFA4DRbd3Ehtrs4Gk7XiCjWkUyM6wjmH7l/1hNQ==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.22.8.tgz", + "integrity": "sha512-ZmkfH0PtjvF1UcKsjw0H7V6r+LC0yKzEfg76Jhs2nIqIgsxsSOVfHwS7z0/1IWnyXxSw36m+NjCAotNHRILGmA==", "requires": { - "@jimp/utils": "^0.22.7" + "@jimp/utils": "^0.22.8" } }, "@jimp/plugins": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.22.7.tgz", - "integrity": "sha512-AJmzTG/sa+CDpvle/UE89hjHR85gnRGSwLuQqPbhlY6GFCmC3uqHRJz9O5I8A4zdi9+e8LsBphuTlKV7RbuXOw==", - "requires": { - "@jimp/plugin-blit": "^0.22.7", - "@jimp/plugin-blur": "^0.22.7", - "@jimp/plugin-circle": "^0.22.7", - "@jimp/plugin-color": "^0.22.7", - "@jimp/plugin-contain": "^0.22.7", - "@jimp/plugin-cover": "^0.22.7", - "@jimp/plugin-crop": "^0.22.7", - "@jimp/plugin-displace": "^0.22.7", - "@jimp/plugin-dither": "^0.22.7", - "@jimp/plugin-fisheye": "^0.22.7", - "@jimp/plugin-flip": "^0.22.7", - "@jimp/plugin-gaussian": "^0.22.7", - "@jimp/plugin-invert": "^0.22.7", - "@jimp/plugin-mask": "^0.22.7", - "@jimp/plugin-normalize": "^0.22.7", - "@jimp/plugin-print": "^0.22.7", - "@jimp/plugin-resize": "^0.22.7", - "@jimp/plugin-rotate": "^0.22.7", - "@jimp/plugin-scale": "^0.22.7", - "@jimp/plugin-shadow": "^0.22.7", - "@jimp/plugin-threshold": "^0.22.7", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.22.8.tgz", + "integrity": "sha512-ieI2+kCpmIfjwVlT7B67ULCzxMizfj7LspJh9HnIZCDXQB9GBOZ9KImLYc75Krae0dP/3FR7FglLiSI7fkOHbw==", + "requires": { + "@jimp/plugin-blit": "^0.22.8", + "@jimp/plugin-blur": "^0.22.8", + "@jimp/plugin-circle": "^0.22.8", + "@jimp/plugin-color": "^0.22.8", + "@jimp/plugin-contain": "^0.22.8", + "@jimp/plugin-cover": "^0.22.8", + "@jimp/plugin-crop": "^0.22.8", + "@jimp/plugin-displace": "^0.22.8", + "@jimp/plugin-dither": "^0.22.8", + "@jimp/plugin-fisheye": "^0.22.8", + "@jimp/plugin-flip": "^0.22.8", + "@jimp/plugin-gaussian": "^0.22.8", + "@jimp/plugin-invert": "^0.22.8", + "@jimp/plugin-mask": "^0.22.8", + "@jimp/plugin-normalize": "^0.22.8", + "@jimp/plugin-print": "^0.22.8", + "@jimp/plugin-resize": "^0.22.8", + "@jimp/plugin-rotate": "^0.22.8", + "@jimp/plugin-scale": "^0.22.8", + "@jimp/plugin-shadow": "^0.22.8", + "@jimp/plugin-threshold": "^0.22.8", "timm": "^1.6.1" } }, "@jimp/png": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.22.7.tgz", - "integrity": "sha512-LxD3O9FKEwVv+j+HcUV7ez72Miy+823EjhtFZbBYXNp9qjHtHFBpgcSJBftUOCei8OlmmVgULYn9XjyfPsDgGw==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.22.8.tgz", + "integrity": "sha512-XOj11kcCr8zKg24QSwlRfH9k4hbV6rkMGUVxMS3puRzzB0FBSQy42NBYEfYf2XlY2QJSAByPl4AYerOtKb805w==", "requires": { - "@jimp/utils": "^0.22.7", + "@jimp/utils": "^0.22.8", "pngjs": "^6.0.0" } }, "@jimp/tiff": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.22.7.tgz", - "integrity": "sha512-/oE8kLumzBfU1Z6h4TrDXYCGQNc4CjbZQvPssjImEqNLr5vbefpIpoy1fVMpsyuHZHsGovsBhBHxTJaRLO4+Og==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.22.8.tgz", + "integrity": "sha512-K0hYUVW5MLgwq3jiHVHa6LvP05J1rXOlRCC+5dMTUnAXVwi45+MKsqA/8lzzwhHYJ65CNhZwy6D3+ZNzM9SIBQ==", "requires": { "utif2": "^4.0.1" } }, "@jimp/types": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.22.7.tgz", - "integrity": "sha512-1T8BxwDh5HJvBh3tt6HUd8r7ir5Ge3JWATXC8O3Y9QYwOaERjA2+FVhGSjtoo5xCeJvLRjSzEtfZ8heowMBL4w==", - "requires": { - "@jimp/bmp": "^0.22.7", - "@jimp/gif": "^0.22.7", - "@jimp/jpeg": "^0.22.7", - "@jimp/png": "^0.22.7", - "@jimp/tiff": "^0.22.7", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.22.8.tgz", + "integrity": "sha512-9+xc+mzuYwu0i+6dsnhXiUgfcS+Ktqn5q2jczoKyyBT0cOKgsk+57EIeFLgpTfVGRKRR0y/UIdHByeCzGguF3A==", + "requires": { + "@jimp/bmp": "^0.22.8", + "@jimp/gif": "^0.22.8", + "@jimp/jpeg": "^0.22.8", + "@jimp/png": "^0.22.8", + "@jimp/tiff": "^0.22.8", "timm": "^1.6.1" } }, "@jimp/utils": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.22.7.tgz", - "integrity": "sha512-4ax4IOWLIERx4yz9y3fNXKvQaPOY23yJF5h4sizxVkQUObkZHWE0kL0TVHodBt3rS8ksdbCL8Jkz4GeNP/Katg==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.22.8.tgz", + "integrity": "sha512-AaqjfqDeLzSFzrbGRKHMXg/ntiWKvoG9tpVgWzgOx5/gPWj/IyGfztojLTTvY8HqZCr25z8z91u2lAQD2v46Jw==", "requires": { "regenerator-runtime": "^0.13.3" } @@ -16323,13 +16323,13 @@ } }, "jimp": { - "version": "0.22.7", - "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.22.7.tgz", - "integrity": "sha512-TJCTJ4ZcFUw6W8XZnR6ajdEu8vSyPi3AuoChs+zLHalXnhAPZgwkzwcXnxey4LNjh1p9dfIUkg8YSQ+q8pBW0A==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.22.8.tgz", + "integrity": "sha512-pBbrooJMX7795sDcxx1XpwNZC8B/ITyDV+JK2/1qNbQl/1UWqWeh5Dq7qQpMZl5jLdcFDv5IVTM+OhpafSqSFA==", "requires": { - "@jimp/custom": "^0.22.7", - "@jimp/plugins": "^0.22.7", - "@jimp/types": "^0.22.7", + "@jimp/custom": "^0.22.8", + "@jimp/plugins": "^0.22.8", + "@jimp/types": "^0.22.8", "regenerator-runtime": "^0.13.3" } }, @@ -17439,9 +17439,9 @@ "dev": true }, "nodemailer": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.1.tgz", - "integrity": "sha512-qHw7dOiU5UKNnQpXktdgQ1d3OFgRAekuvbJLcdG5dnEo/GtcTHRYM7+UfJARdOFU9WUQO8OiIamgWPmiSFHYAA==" + "version": "6.9.2", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.2.tgz", + "integrity": "sha512-4+TYaa/e1nIxQfyw/WzNPYTEZ5OvHIDEnmjs4LPmIfccPQN+2CYKmGHjWixn/chzD3bmUTu5FMfpltizMxqzdg==" }, "nodemon": { "version": "2.0.21", @@ -19393,9 +19393,9 @@ "integrity": "sha512-8pMuAn4KacYdGMkFaoQARicp4HSw24/DHOVKWqVRJ8LhhAwPPFpdGvdL9184JVmUwe7vz7Z9n6IqI6t5n2ELdg==" }, "utif2": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/utif2/-/utif2-4.0.1.tgz", - "integrity": "sha512-KMaD76dbzK1VjbwsckHJiqDjhP3pbpwyV+FdqkY6XFQenc2o/HS6pjPSYdu4+NQMHf2NLTW+nVP/eFP1CvOYQQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/utif2/-/utif2-4.1.0.tgz", + "integrity": "sha512-+oknB9FHrJ7oW7A2WZYajOcv4FcDR4CfoGB0dPNfxbi4GO05RRnFmt5oa23+9w32EanrYcSJWspUiJkLMs+37w==", "requires": { "pako": "^1.0.11" } diff --git a/package.json b/package.json index 1513695a21e..a8b0ac8055f 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "grunt-contrib-sass": "2.0.0", "grunt-contrib-uglify": "5.2.2", "icanhazip": "^1.0.3", - "jimp": "0.22.7", + "jimp": "0.22.8", "json2csv": "5.0.7", "jsonwebtoken": "9.0.0", "later": "1.2.0", @@ -77,7 +77,7 @@ "moment-timezone": "0.5.43", "mongodb": "4.9.1", "nginx-conf": "2.1.0", - "nodemailer": "6.9.1", + "nodemailer": "6.9.2", "object-hash": "3.0.0", "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git", "properties-parser": "0.3.1", diff --git a/plugins/crashes/api/api.js b/plugins/crashes/api/api.js index f98c6b13db0..546677c6e83 100644 --- a/plugins/crashes/api/api.js +++ b/plugins/crashes/api/api.js @@ -18,7 +18,8 @@ plugins.setConfigs("crashes", { report_limit: 100, grouping_strategy: "error_and_file", smart_preprocessing: true, - smart_regexes: "{.*?}\n/.*?/" + smart_regexes: "{.*?}\n/.*?/", + same_app_version_crash_update: false }); /** @@ -677,8 +678,18 @@ plugins.setConfigs("crashes", { if (crashGroup.latest_version && common.versionCompare(report.app_version.replace(/\./g, ":"), crashGroup.latest_version.replace(/\./g, ":")) > 0) { group.latest_version = report.app_version; group.latest_version_for_sort = versionUtils.transformAppVersion(report.app_version); - group.error = report.error; - group.lrid = report._id + ""; + } + if (plugins.getConfig('crashes').same_app_version_crash_update) { + if (crashGroup.latest_version && common.versionCompare(report.app_version.replace(/\./g, ":"), crashGroup.latest_version.replace(/\./g, ":")) >= 0) { + group.error = report.error; + group.lrid = report._id + ""; + } + } + else { + if (crashGroup.latest_version && common.versionCompare(report.app_version.replace(/\./g, ":"), crashGroup.latest_version.replace(/\./g, ":")) > 0) { + group.error = report.error; + group.lrid = report._id + ""; + } } if (crashGroup.resolved_version && crashGroup.is_resolved && common.versionCompare(report.app_version.replace(/\./g, ":"), crashGroup.resolved_version.replace(/\./g, ":")) > 0) { group.is_resolved = false; diff --git a/plugins/crashes/api/parts/stacktrace.js b/plugins/crashes/api/parts/stacktrace.js index b20987a3a74..b77291e9322 100644 --- a/plugins/crashes/api/parts/stacktrace.js +++ b/plugins/crashes/api/parts/stacktrace.js @@ -72,10 +72,10 @@ var trace = { seed = seed.replace(/(?