diff --git a/.gitignore b/.gitignore index 66ff7ab337..b82cd9c314 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ tx.exe ##Coverage output coverage +.nyc_output build *.log diff --git a/package.json b/package.json index f228fa064b..aad4a1cade 100644 --- a/package.json +++ b/package.json @@ -13,38 +13,38 @@ "start": "node loader.js", "lint": "eslint --cache ./nodebb .", "pretest": "npm run lint", - "test": "istanbul cover node_modules/mocha/bin/_mocha -- -R dot", - "coveralls": "istanbul cover _mocha --report lcovonly -- -R dot && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage" + "test": "nyc --reporter=html --reporter=text-summary mocha", + "coveralls": "nyc report --reporter=text-lcov | coveralls && rm -r coverage" }, "dependencies": { - "ace-builds": "^1.2.8", + "ace-builds": "^1.2.9", "async": "2.5.0", - "autoprefixer": "7.1.4", + "autoprefixer": "7.1.6", "bcryptjs": "2.4.3", - "benchpressjs": "^1.1.0", + "benchpressjs": "^1.1.2", "body-parser": "^1.18.2", "bootstrap": "^3.3.7", - "chart.js": "^2.6.0", + "chart.js": "^2.7.0", "colors": "^1.1.2", "compression": "^1.7.1", "connect-ensure-login": "^0.1.1", "connect-flash": "^0.1.1", - "connect-mongo": "1.3.2", - "connect-multiparty": "^2.0.0", + "connect-mongo": "2.0.0", + "connect-multiparty": "^2.1.0", "connect-redis": "3.3.2", "cookie-parser": "^1.4.3", - "cron": "^1.2.1", - "cropperjs": "^1.0.0", + "cron": "^1.3.0", + "cropperjs": "^1.1.3", "csurf": "^1.9.0", "daemon": "^1.1.0", - "express": "^4.16.1", + "express": "^4.16.2", "express-session": "^1.15.6", "express-useragent": "1.0.8", "html-to-text": "3.3.0", - "ipaddr.js": "^1.5.2", + "ipaddr.js": "^1.5.4", "jimp": "0.2.28", "jquery": "^3.2.1", - "json-2-csv": "^2.1.1", + "json-2-csv": "^2.1.2", "less": "^2.7.2", "lodash": "^4.17.4", "logrotate-stream": "^0.2.5", @@ -52,7 +52,7 @@ "mime": "^2.0.3", "minimist": "^1.2.0", "mkdirp": "^0.5.1", - "mongodb": "2.2.31", + "mongodb": "2.2.33", "morgan": "^1.9.0", "mousetrap": "^1.6.1", "nconf": "^0.8.5", @@ -60,7 +60,7 @@ "nodebb-plugin-dbsearch": "2.0.6", "nodebb-plugin-emoji-extended": "1.1.1", "nodebb-plugin-emoji-one": "1.2.1", - "nodebb-plugin-markdown": "8.1.0", + "nodebb-plugin-markdown": "8.2.0", "nodebb-plugin-mentions": "2.1.7", "nodebb-plugin-soundpack-default": "1.0.0", "nodebb-plugin-spam-be-gone": "0.5.1", @@ -70,10 +70,10 @@ "nodebb-theme-slick": "1.1.1", "nodebb-theme-vanilla": "7.1.2", "nodebb-widget-essentials": "3.0.7", - "nodemailer": "4.1.1", + "nodemailer": "4.3.0", "passport": "^0.4.0", "passport-local": "1.0.0", - "postcss": "6.0.12", + "postcss": "6.0.13", "postcss-clean": "1.1.0", "promise-polyfill": "^6.0.2", "prompt": "^1.0.0", @@ -85,31 +85,31 @@ "semver": "^5.4.1", "serve-favicon": "^2.4.5", "sitemap": "^1.13.0", - "socket.io": "2.0.3", - "socket.io-client": "2.0.3", + "socket.io": "2.0.4", + "socket.io-client": "2.0.4", "socket.io-redis": "5.2.0", "socketio-wildcard": "2.0.0", "spdx-license-list": "^3.0.1", "string": "^3.3.3", "toobusy-js": "^0.5.1", - "uglify-js": "^3.1.3", + "uglify-js": "^3.1.5", "validator": "9.0.0", - "winston": "^2.3.1", + "winston": "^2.4.0", "xml": "^1.0.1", "xregexp": "3.2.0", "zxcvbn": "^4.4.2" }, "devDependencies": { "coveralls": "^3.0.0", - "eslint": "^4.8.0", - "eslint-config-airbnb-base": "^12.0.1", - "eslint-plugin-import": "^2.7.0", + "eslint": "^4.9.0", + "eslint-config-airbnb-base": "^12.1.0", + "eslint-plugin-import": "^2.8.0", "grunt": "^1.0.1", "grunt-contrib-watch": "^1.0.0", - "istanbul": "^0.4.5", "jsdom": "^11.3.0", - "mocha": "^3.5.3", - "mocha-lcov-reporter": "^1.3.0" + "mocha": "^4.0.1", + "mocha-lcov-reporter": "^1.3.0", + "nyc": "^11.2.1" }, "bugs": { "url": "https://github.com/NodeBB/NodeBB/issues" diff --git a/test/mocha.opts b/test/mocha.opts index 9455d82707..673281c7b4 100644 --- a/test/mocha.opts +++ b/test/mocha.opts @@ -1,2 +1,3 @@ --reporter dot --timeout 25000 +--exit \ No newline at end of file