From 9f47b05f0d900ca801e0fddab0f38d8588f56ad3 Mon Sep 17 00:00:00 2001 From: Thomas Lynch Date: Sun, 26 Jul 2020 00:21:27 +1000 Subject: [PATCH] update deps --- package-lock.json | 138 ++++++++++++++++++++++++---------------------- package.json | 11 ++-- 2 files changed, 79 insertions(+), 70 deletions(-) diff --git a/package-lock.json b/package-lock.json index 75ec9fad..2acc7063 100644 --- a/package-lock.json +++ b/package-lock.json @@ -323,6 +323,32 @@ } } }, + "@tohru/gm": { + "version": "git+https://gitgud.io/fatchan/gm.git#b22827491ec6b00c4345a2052a49e24bca90c4c0", + "from": "git+https://gitgud.io/fatchan/gm.git", + "requires": { + "array-parallel": "^0.1.3", + "array-series": "^0.1.5", + "cross-spawn": "^7.0.3", + "debug": "^4.1.1", + "tmp": "^0.2.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "@types/babel-types": { "version": "7.0.7", "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.7.tgz", @@ -366,25 +392,11 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.17.tgz", "integrity": "sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA==" }, - "@types/prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-f8JzJNWVhKtc9dg/dyDNfliTKNOJSLa7Oht/ElZdF/UbMUmAH3rLmAk3ODNjw0mZajDEgatA03tRjB4+Dp/tzA==" - }, "@types/pug": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/pug/-/pug-2.0.4.tgz", "integrity": "sha1-h3L80EGOPNLMFxVV1zAHQVBR9LI=" }, - "@types/react": { - "version": "16.9.2", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.2.tgz", - "integrity": "sha512-jYP2LWwlh+FTqGd9v7ynUKZzjj98T8x7Yclz479QdRhHfuW9yQ+0jjnD31eXSXutmBpppj5PYNLYLRfnZJvcfg==", - "requires": { - "@types/prop-types": "*", - "csstype": "^2.2.0" - } - }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -857,14 +869,6 @@ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, - "auto-bind": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-2.1.0.tgz", - "integrity": "sha512-qZuFvkes1eh9lB2mg8/HG18C+5GIO51r+RrCSst/lh+i5B1CtVlkhTE488M805Nr3dKl0sM/pIFKSKUIlg3zUg==", - "requires": { - "@types/react": "^16.8.12" - } - }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -1001,8 +1005,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "resolved": "" } } }, @@ -1176,9 +1179,9 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "bull": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/bull/-/bull-3.14.0.tgz", - "integrity": "sha512-qQrytpqbE6Zjl2zkvlqS1kUwWLJHpDOhhuGb34+5atPeZrd8DlxkAbxnLnaMB1XQX1iXPzFVpDOUOIIROYKp6Q==", + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/bull/-/bull-3.16.0.tgz", + "integrity": "sha512-5RAeKPJwhzuk5y4TL5ys+mX1p1r8TOKUF537c2VFVqg0Z+Y2zL1gXfgk0OAlIhD+9E/q3BgRvN96AxUz6nfBDA==", "requires": { "cron-parser": "^2.13.0", "debuglog": "^1.0.0", @@ -1189,7 +1192,7 @@ "promise.prototype.finally": "^3.1.2", "semver": "^6.3.0", "util.promisify": "^1.0.1", - "uuid": "^3.4.0" + "uuid": "^8.2.0" }, "dependencies": { "semver": { @@ -1198,9 +1201,9 @@ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.2.0.tgz", + "integrity": "sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q==" } } }, @@ -1234,14 +1237,13 @@ } }, "cache-pug-templates": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/cache-pug-templates/-/cache-pug-templates-2.0.1.tgz", - "integrity": "sha512-fl7y62VJ2XH5CflSlkKOJxLWg7RpP8/y7/OBKGwZM0A+bRWPh7RdzFGXLfnuYeFncphaGkhW4Zt4qvnIwHi88A==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/cache-pug-templates/-/cache-pug-templates-2.0.3.tgz", + "integrity": "sha512-ebRgvFRTCN4+GYvRoUi/s8EiHeZjE/6ZvmacTTtLgRITWkZeoaeEtsB0o1RmwkGAGj9mlH3Fx5ikRa1r2hYjEQ==", "requires": { - "auto-bind": "^2.1.0", "debug": "^4.1.1", "function-rate-limit": "^1.1.0", - "lodash": "^4.17.11" + "lodash": "^4.17.19" }, "dependencies": { "debug": { @@ -1252,6 +1254,11 @@ "ms": "^2.1.1" } }, + "lodash": { + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -1723,12 +1730,22 @@ } }, "cron-parser": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-2.13.0.tgz", - "integrity": "sha512-UWeIpnRb0eyoWPVk+pD3TDpNx3KCFQeezO224oJIkktBrcW6RoAPOx5zIKprZGfk6vcYSmA8yQXItejSaDBhbQ==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-2.15.0.tgz", + "integrity": "sha512-rMFkrQw8+oG5OuwjiXesup4KeIlEG/IU82YtG4xyAHbO5jhKmYaHPp/ZNhq9+7TjSJ65E3zV3kQPUbmXSff2/g==", "requires": { - "is-nan": "^1.2.1", - "moment-timezone": "^0.5.25" + "is-nan": "^1.3.0", + "moment-timezone": "^0.5.31" + }, + "dependencies": { + "moment-timezone": { + "version": "0.5.31", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.31.tgz", + "integrity": "sha512-+GgHNg8xRhMXfEbv81iDtrVeTcWt0kWmTEY1XQK14dICTXnWJnT0dxdlPspwqF3keKMVPXwayEsk1DI0AA/jdA==", + "requires": { + "moment": ">= 2.9.0" + } + } } }, "cross-spawn": { @@ -1761,11 +1778,6 @@ "uid-safe": "2.1.5" } }, - "csstype": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.6.tgz", - "integrity": "sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg==" - }, "csurf": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.11.0.tgz", @@ -2668,8 +2680,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "resolved": "" } } }, @@ -4258,9 +4269,9 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" }, "highlight.js": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.0.3.tgz", - "integrity": "sha512-9FG7SSzv9yOY5CGGxfI6NDm7xLYtMOjKtPBxw7Zff3t5UcRcUNTGEeS8lNjhceL34KeetLMoGMFTGoaa83HwyQ==" + "version": "10.1.2", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.1.2.tgz", + "integrity": "sha512-Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA==" }, "homedir-polyfill": { "version": "1.0.3", @@ -4946,9 +4957,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" }, "lodash.clone": { "version": "4.5.0", @@ -5478,9 +5489,9 @@ } }, "mongodb": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.8.tgz", - "integrity": "sha512-jz7mR58z66JKL8Px4ZY+FXbgB7d0a0hEGCT7kw8iye46/gsqPrOEpZOswwJ2BQlfzsrCLKdsF9UcaUfGVN2HrQ==", + "version": "3.5.9", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.9.tgz", + "integrity": "sha512-vXHBY1CsGYcEPoVWhwgxIBeWqP3dSu9RuRDsoLRPTITrcrgm1f0Ubu1xqF9ozMwv53agmEiZm0YGo+7WL3Nbug==", "requires": { "bl": "^2.2.0", "bson": "^1.1.4", @@ -7210,16 +7221,14 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sanitize-html": { - "version": "1.26.0", - "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.26.0.tgz", - "integrity": "sha512-xriDBT2FbfN0ZKCcX6H6svkh1bZpO2e5ny05RQGZY6vFOMAU13La2L5YYf3XpcjXSksCYXzPj7YPvyGp5wbaUA==", + "version": "1.27.1", + "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.1.tgz", + "integrity": "sha512-C+N7E+7ikYaLHdb9lEkQaFOgmj+9ddZ311Ixs/QsBsoLD411/vdLweiFyGqrswUVgLqagOS5NCDxcEPH7trObQ==", "requires": { - "chalk": "^2.4.1", "htmlparser2": "^4.1.0", "lodash": "^4.17.15", "postcss": "^7.0.27", - "srcset": "^2.0.1", - "xtend": "^4.0.1" + "srcset": "^2.0.1" } }, "saslprep": { @@ -7439,8 +7448,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "resolved": "" } } }, diff --git a/package.json b/package.json index 62086322..e9fc87cb 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,10 @@ "description": "", "main": "server.js", "dependencies": { + "@tohru/gm": "git+https://gitgud.io/fatchan/gm.git", "bcrypt": "^5.0.0", - "bull": "^3.12.1", - "cache-pug-templates": "^2.0.1", + "bull": "^3.16.0", + "cache-pug-templates": "^2.0.3", "connect-redis": "^4.0.4", "cookie-parser": "^1.4.5", "csurf": "^1.11.0", @@ -26,15 +27,15 @@ "gulp-less": "^4.0.1", "gulp-pug": "^4.0.1", "gulp-uglify-es": "^2.0.0", - "highlight.js": "^10.0.0", + "highlight.js": "^10.1.2", "ioredis": "^4.14.1", - "mongodb": "^3.5.0", + "mongodb": "^3.5.9", "node-fetch": "^2.6.0", "path": "^0.12.7", "pm2": "^4.3.0", "pug": "^3.0.0", "redlock": "^4.1.0", - "sanitize-html": "^1.21.1", + "sanitize-html": "^1.27.1", "saslprep": "^1.0.3", "socket.io": "^2.3.0", "socket.io-redis": "^5.2.0",