Skip to content

Commit 5430dc9

Browse files
author
Oliver Rumbelow
authored
Merge pull request holidayextras#36 from holidayextras/v1.5.1
v1.5.1 - Bumping dependencies
2 parents 18b9acf + 38a81bc commit 5430dc9

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: node_js
22
services:
33
- mongodb
44
node_js:
5-
- "0.10"
5+
- "6"
66
script: "npm run $TEST_STEP"
77
env:
88
matrix:

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
- 2016-12-09 - v1.5.1
2+
- 2016-12-09 - Bump all dependencies
13
- 2016-06-25 - v1.5.0
24
- 2016-06-25 - Create individual indexes for related resources
35
- 2016-05-31 - v1.4.0

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jsonapi-store-mongodb",
3-
"version": "1.5.0",
3+
"version": "1.5.1",
44
"description": "MongoDB data store for jsonapi-server.",
55
"main": "lib/mongoHandler.js",
66
"repository": {
@@ -25,19 +25,19 @@
2525
"node": "*"
2626
},
2727
"dependencies": {
28-
"async": "^1.5.2",
28+
"async": "^2.1.4",
2929
"debug": "^2.2.0",
30-
"joi": "^6.10.1",
30+
"joi": "^10.0.5",
3131
"lodash.omitby": "^4.4.0",
3232
"mongodb": "^2.1.20",
3333
"semver": "^5.1.0"
3434
},
3535
"devDependencies": {
3636
"blanket": "^1.2.3",
3737
"coveralls": "^2.11.9",
38-
"eslint": "^2.11.0",
39-
"jsonapi-server": "^1.10.0",
40-
"mocha": "^2.5.3",
38+
"eslint": "^3.11.1",
39+
"jsonapi-server": "^2.2.1",
40+
"mocha": "^3.2.0",
4141
"mocha-lcov-reporter": "^1.2.0",
4242
"mocha-performance": "^0.1.1",
4343
"plato": "^1.5.0",

test/proxy.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ var fs = require("fs");
1919
var path = require("path");
2020
var base = path.join(__dirname, "../node_modules/jsonapi-server/test");
2121
fs.readdirSync(base).forEach(function(filename) {
22-
require(path.join(base, filename));
22+
try {
23+
require(path.join(base, filename));
24+
} catch(e) { }
2325
});
2426

2527
// Before starting the test suite, load all example resouces, aka

0 commit comments

Comments
 (0)