fix(deps): bump dependencies (#8239)

* fix(deps): bump dependencies

* fix(deps): commander@5

* fix(deps): use @nodebb/mubsub

install/package.json

@@ -29,59 +29,59 @@
         ]
     },
     "dependencies": {
-        "ace-builds": "^1.2.9",
+        "ace-builds": "^1.4.9",
-        "archiver": "^3.0.0",
+        "archiver": "^3.1.1",
-        "async": "^3.0.1",
+        "async": "^3.2.0",
-        "autoprefixer": "^9.4.6",
+        "autoprefixer": "^9.7.6",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "^2.0.0",
+        "benchpressjs": "^2.0.2",
-        "body-parser": "^1.18.2",
+        "body-parser": "^1.19.0",
-        "bootstrap": "^3.4.0",
+        "bootstrap": "^3.4.1",
         "bootswatch": "git://github.com/thomaspark/bootswatch.git#c41a8f066feb8950c6f9c6bcf5a3c37d1085404e",
-        "chart.js": "^2.7.1",
+        "chart.js": "^2.9.3",
         "cli-graph": "^3.2.2",
-        "clipboard": "^2.0.1",
+        "clipboard": "^2.0.6",
-        "colors": "^1.1.2",
+        "colors": "^1.4.0",
-        "commander": "^3.0.0",
+        "commander": "^5.0.0",
-        "compression": "^1.7.1",
+        "compression": "^1.7.4",
         "connect-ensure-login": "^0.1.1",
         "connect-flash": "^0.1.1",
         "connect-mongo": "3.2.0",
-        "connect-multiparty": "^2.1.0",
+        "connect-multiparty": "^2.2.0",
-        "connect-pg-simple": "^6.0.0",
+        "connect-pg-simple": "^6.1.0",
         "connect-redis": "4.0.4",
-        "cookie-parser": "^1.4.3",
+        "cookie-parser": "^1.4.5",
-        "cron": "^1.3.0",
+        "cron": "^1.8.2",
-        "cropperjs": "^1.2.2",
+        "cropperjs": "^1.5.6",
-        "csurf": "^1.9.0",
+        "csurf": "^1.11.0",
         "daemon": "^1.1.0",
-        "diff": "^4.0.1",
+        "diff": "^4.0.2",
-        "express": "^4.16.2",
+        "express": "^4.17.1",
-        "express-session": "^1.15.6",
+        "express-session": "^1.17.0",
-        "express-useragent": "^1.0.12",
+        "express-useragent": "^1.0.13",
-        "graceful-fs": "^4.1.11",
+        "graceful-fs": "^4.2.3",
-        "helmet": "^3.11.0",
+        "helmet": "^3.22.0",
-        "html-to-text": "^5.0.0",
+        "html-to-text": "^5.1.1",
-        "ipaddr.js": "^1.5.4",
+        "ipaddr.js": "^1.9.1",
         "jquery": "3.4.1",
         "jsesc": "3.0.1",
-        "json-2-csv": "^3.0.0",
+        "json-2-csv": "^3.6.2",
-        "jsonwebtoken": "^8.4.0",
+        "jsonwebtoken": "^8.5.1",
-        "less": "^3.10.3",
+        "less": "^3.11.1",
         "lodash": "^4.17.15",
-        "logrotate-stream": "^0.2.5",
+        "logrotate-stream": "^0.2.6",
         "lru-cache": "5.1.1",
         "material-design-lite": "^1.3.0",
-        "mime": "^2.2.0",
+        "mime": "^2.4.4",
-        "mkdirp": "^1.0.3",
+        "mkdirp": "^1.0.4",
         "mongodb": "3.5.5",
-        "morgan": "^1.9.1",
+        "morgan": "^1.10.0",
-        "mousetrap": "^1.6.1",
+        "mousetrap": "^1.6.5",
-        "mubsub-nbb": "^1.5.1",
+        "@nodebb/mubsub": "^1.6.0",
         "nconf": "^0.10.0",
         "nodebb-plugin-composer-default": "6.3.23",
         "nodebb-plugin-dbsearch": "4.0.7",
-        "nodebb-plugin-emoji": "^3.0.0",
+        "nodebb-plugin-emoji": "^3.3.0",
         "nodebb-plugin-emoji-android": "2.0.0",
         "nodebb-plugin-markdown": "8.11.2",
         "nodebb-plugin-mentions": "2.7.4",
@@ -93,32 +93,32 @@
         "nodebb-theme-slick": "1.2.29",
         "nodebb-theme-vanilla": "11.1.16",
         "nodebb-widget-essentials": "4.1.0",
-        "nodemailer": "^6.0.0",
+        "nodemailer": "^6.4.6",
-        "passport": "^0.4.0",
+        "passport": "^0.4.1",
         "passport-local": "1.0.0",
-        "pg": "^8.0.0",
+        "pg": "^8.0.2",
-        "pg-cursor": "^2.0.0",
+        "pg-cursor": "^2.1.9",
         "postcss": "7.0.27",
         "postcss-clean": "1.1.0",
-        "promise-polyfill": "^8.0.0",
+        "promise-polyfill": "^8.1.3",
         "prompt": "^1.0.0",
         "redis": "3.0.2",
         "request": "2.88.2",
         "rimraf": "3.0.2",
         "rss": "^1.2.2",
-        "sanitize-html": "^1.16.3",
+        "sanitize-html": "^1.23.0",
-        "semver": "^7.0.0",
+        "semver": "^7.2.1",
-        "serve-favicon": "^2.4.5",
+        "serve-favicon": "^2.5.0",
         "sharp": "0.25.2",
-        "sitemap": "^6.0.0",
+        "sitemap": "^6.1.0",
         "socket.io": "2.3.0",
         "socket.io-adapter-cluster": "^1.0.1",
-        "socket.io-adapter-mongo": "^2.0.4",
+        "socket.io-adapter-mongo": "^2.0.5",
         "socket.io-adapter-postgres": "^1.2.1",
         "socket.io-client": "2.3.0",
         "socket.io-redis": "5.2.0",
         "socketio-wildcard": "2.0.0",
-        "spdx-license-list": "^6.0.0",
+        "spdx-license-list": "^6.1.0",
         "spider-detector": "2.0.0",
         "textcomplete": "^0.17.1",
         "textcomplete.contenteditable": "^0.1.1",
@@ -127,7 +127,7 @@
         "validator": "13.0.0",
         "winston": "3.2.1",
         "xml": "^1.0.1",
-        "xregexp": "^4.1.1",
+        "xregexp": "^4.3.0",
         "zxcvbn": "^4.4.2"
     },
     "devDependencies": {

src/cli/index.js

@@ -82,10 +82,9 @@ program
 	.version(pkg.version)
 	.option('--json-logging', 'Output to logs in JSON format', false)
 	.option('--log-level <level>', 'Default logging level to use', 'info')
+	.option('--config <value>', 'Specify a config file', 'config.json')
 	.option('-d, --dev', 'Development mode, including verbose logging', false)
-	.option('-l, --log', 'Log subprocess output to console', false)
+	.option('-l, --log', 'Log subprocess output to console', false);
-	.option('-c, --config <value>', 'Specify a config file', 'config.json')
-	.parse(process.argv);
 
 nconf.argv().env({
 	separator: '__',
@@ -98,7 +97,7 @@ global.env = env;
 prestart.setupWinston();
 
 // Alternate configuration file support
-var	configFile = path.resolve(dirname, program.config);
+var	configFile = path.resolve(dirname, nconf.get('config') || 'config.json');
 var configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
 
 prestart.loadConfig(configFile);

src/database/mongo/pubsub.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const mubsub = require('mubsub-nbb');
+const mubsub = require('@nodebb/mubsub');
 const connection = require('./connection');
 
 const client = mubsub(connection.getConnectionString(), connection.getConnectionOptions());