diff --git a/changelog.md b/changelog.md index 7857db5369..5b175938e8 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Change Log +## [v3.1.2](https://github.com/feathersjs/feathers/tree/v3.1.2) (2018-02-10) +[Full Changelog](https://github.com/feathersjs/feathers/compare/v3.1.1...v3.1.2) + +**Merged pull requests:** + +- Handle errors in error hooks properly [\#819](https://github.com/feathersjs/feathers/pull/819) ([daffl](https://github.com/daffl)) + ## [v3.1.1](https://github.com/feathersjs/feathers/tree/v3.1.1) (2018-02-08) [Full Changelog](https://github.com/feathersjs/feathers/compare/v3.1.0...v3.1.1) diff --git a/lib/version.js b/lib/version.js index a2dbd8817a..5116c67cd3 100644 --- a/lib/version.js +++ b/lib/version.js @@ -1 +1 @@ -module.exports = '3.1.2'; +module.exports = '3.1.3'; diff --git a/package-lock.json b/package-lock.json index 2ea1b94f37..f4636daca8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@feathersjs/feathers", - "version": "3.1.2", + "version": "3.1.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -854,9 +854,9 @@ "dev": true }, "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/events/-/events-2.0.0.tgz", + "integrity": "sha512-r/M5YkNg9zwI8QbSf7tsDWWJvO3PGwZXyG7GpFAxtMASnHL2eblFd7iHiGPtyGKKFPZ59S63NeX10Ws6WqGDcg==" }, "execa": { "version": "0.7.0", @@ -1762,9 +1762,9 @@ } }, "mocha": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz", - "integrity": "sha512-evDmhkoA+cBNiQQQdSKZa2b9+W2mpLoj50367lhy+Klnx9OV8XlCIhigUnn1gaTFLQCa0kdNhEGDr0hCXOQFDw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz", + "integrity": "sha512-SpwyojlnE/WRBNGtvJSNfllfm5PqEDFxcWluSIgLeSBJtXG4DmoX2NNAeEA7rP5kK+79VgtVq8nG6HskaL1ykg==", "dev": true, "requires": { "browser-stdout": "1.3.0", diff --git a/package.json b/package.json index df2f36ac64..3f3c13d503 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@feathersjs/feathers", "description": "A REST and realtime API layer for modern applications.", - "version": "3.1.2", + "version": "3.1.3", "homepage": "http://feathersjs.com", "repository": { "type": "git", @@ -52,7 +52,7 @@ "dependencies": { "@feathersjs/commons": "^1.4.0", "debug": "^3.1.0", - "events": "^1.1.1", + "events": "^2.0.0", "uberproto": "^1.2.0" }, "devDependencies": { diff --git a/readme.md b/readme.md index 3a0edd7d4d..0bd58aeb9f 100644 --- a/readme.md +++ b/readme.md @@ -4,16 +4,12 @@ [![Build Status](https://travis-ci.org/feathersjs/feathers.png?branch=master)](https://travis-ci.org/feathersjs/feathers) [![Dependency Status](https://img.shields.io/david/feathersjs/feathers.svg?style=flat-square)](https://david-dm.org/feathersjs/feathers) - -[![Greenkeeper badge](https://badges.greenkeeper.io/feathersjs/feathers.svg)](https://greenkeeper.io/) [![Maintainability](https://api.codeclimate.com/v1/badges/cb5ec42a2d0cc1a47a02/maintainability)](https://codeclimate.com/github/feathersjs/feathers/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/cb5ec42a2d0cc1a47a02/test_coverage)](https://codeclimate.com/github/feathersjs/feathers/test_coverage) -[![Download Status](https://img.shields.io/npm/dm/feathers.svg?style=flat-square)](https://www.npmjs.com/package/feathers) +[![Download Status](https://img.shields.io/npm/dm/@feathersjs/feathers.svg?style=flat-square)](https://www.npmjs.com/package/@feathersjs/feathers) + [![Slack Status](http://slack.feathersjs.com/badge.svg)](http://slack.feathersjs.com) [![Telegram Status](https://img.shields.io/badge/Telegram_RU_chat:-Feathers-216bc1.svg?style=flat)](https://t.me/featherjs) -[![OpenCollective](https://opencollective.com/feathers/backers/badge.svg)](#backers) -[![OpenCollective](https://opencollective.com/feathers/sponsors/badge.svg)](#sponsors) - Feathers is a real-time, micro-service web framework for NodeJS that gives you control over your data via RESTful resources, sockets and flexible plug-ins.