Merge pull request #305 from holidayextras/update-dependencies

Update dependencies
holidayextras · Jul 14, 2017 · 368ad6b · 368ad6b
2 parents 72ef518 + 1c0e0d0
commit 368ad6b
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+- 2017-07-14 - v3.0.1
+- 2017-07-14 - Update dependencies.
 - 2017-06-01 - v3.0.0
 - 2017-06-01 - Use `Buffer.from` instead of deprecated `new Buffer` which only supports Node.js >= 4.5.0 requiring a major version upgrade for SemVer compliance
 - 2017-06-01 - Fix GraphQL updates

diff --git a/lib/MemoryHandler.js b/lib/MemoryHandler.js
@@ -47,7 +47,7 @@ MemoryStore.prototype.find = (request, callback) => {
 
   // If the resource doesn't exist, error
   if (!theResource) {
-    return callback({  // eslint-disable-line standard/no-callback-literal
+    return callback({ // eslint-disable-line standard/no-callback-literal
       status: '404',
       code: 'ENOTFOUND',
       title: 'Requested resource does not exist',
@@ -66,7 +66,7 @@ MemoryStore.prototype.create = (request, newResource, callback) => {
   // Check to see if the ID already exists
   const index = MemoryStore._indexOf(resources[request.params.type], newResource)
   if (index !== -1) {
-    return callback({  // eslint-disable-line standard/no-callback-literal
+    return callback({ // eslint-disable-line standard/no-callback-literal
       status: '403',
       code: 'EFORBIDDEN',
       title: 'Requested resource already exists',

diff --git a/lib/filter.js b/lib/filter.js
@@ -51,7 +51,7 @@ filter._parseScalarFilterElement = (attributeConfig, scalarElement) => {
   const error = filter._stringOnlyOperator(splitElement.operator, attributeConfig)
   if (error) return { error }
 
-  if (attributeConfig._settings) {  // relationship attribute: no further validation
+  if (attributeConfig._settings) { // relationship attribute: no further validation
     return { result: splitElement }
   }
 
@@ -117,7 +117,7 @@ filter.parseAndValidate = request => {
 
     if (typeof filterElement === 'string') request.params.filter[key] = filterElement = filterElement.split(FILTER_SEPERATOR)
 
-    if (!Array.isArray(filterElement) && filterElement instanceof Object) continue  // skip deep filters
+    if (!Array.isArray(filterElement) && filterElement instanceof Object) continue // skip deep filters
 
     error = filter._resourceDoesNotHaveProperty(resourceConfig, key)
     if (error) return error

diff --git a/lib/postProcessing/fields.js b/lib/postProcessing/fields.js
@@ -11,7 +11,7 @@ fields.action = (request, response, callback) => {
 
   for (const resource in resourceList) {
     if (!jsonApi._resources[resource]) {
-      return callback({  // eslint-disable-line standard/no-callback-literal
+      return callback({ // eslint-disable-line standard/no-callback-literal
         status: '403',
         code: 'EFORBIDDEN',
         title: 'Invalid field resource',
@@ -23,7 +23,7 @@ fields.action = (request, response, callback) => {
 
     for (const j of field) {
       if (!jsonApi._resources[resource].attributes[j]) {
-        return callback({  // eslint-disable-line standard/no-callback-literal
+        return callback({ // eslint-disable-line standard/no-callback-literal
           status: '403',
           code: 'EFORBIDDEN',
           title: 'Invalid field selection',

diff --git a/lib/postProcessing/sort.js b/lib/postProcessing/sort.js
@@ -12,7 +12,7 @@ sort.action = (request, response, callback) => {
   }
 
   if (!request.resourceConfig.attributes[attribute]) {
-    return callback({  // eslint-disable-line standard/no-callback-literal
+    return callback({ // eslint-disable-line standard/no-callback-literal
       status: '403',
       code: 'EFORBIDDEN',
       title: 'Invalid sort',

diff --git a/lib/router.js b/lib/router.js
@@ -56,7 +56,7 @@ router.applyMiddleware = () => {
       // 406 Not Acceptable
       let matchingTypes = req.headers.accept.split(/, ?/)
       matchingTypes = matchingTypes.filter(mediaType => // Accept application/*, */vnd.api+json, */* and the correct JSON:API type.
-      mediaType.match(/^(\*|application)\/(\*|json|vnd\.api\+json)$/) || mediaType.match(/\*\/\*/))
+        mediaType.match(/^(\*|application)\/(\*|json|vnd\.api\+json)$/) || mediaType.match(/\*\/\*/))
 
       if (matchingTypes.length === 0) {
         return res.status(406).end()

diff --git a/lib/routes/_foreignKeySearch.js b/lib/routes/_foreignKeySearch.js
@@ -30,15 +30,15 @@ foreignKeySearchRoute.register = () => {
       callback => {
         const foreignKeySchema = resourceConfig.attributes[foreignKey]
         if (!foreignKeySchema || !foreignKeySchema._settings) {
-          return callback({  // eslint-disable-line standard/no-callback-literal
+          return callback({ // eslint-disable-line standard/no-callback-literal
             status: '403',
             code: 'EFORBIDDEN',
             title: 'Invalid foreign key lookup',
             detail: `Relation [${foreignKey}] does not exist within ${request.params.type}`
           })
         }
         if (!(foreignKeySchema._settings.__one || foreignKeySchema._settings.__many)) {
-          return callback({  // eslint-disable-line standard/no-callback-literal
+          return callback({ // eslint-disable-line standard/no-callback-literal
             status: '403',
             code: 'EFORBIDDEN',
             title: 'Invalid foreign key lookup',

diff --git a/lib/routes/find.js b/lib/routes/find.js
@@ -35,7 +35,7 @@ findRoute.register = () => {
       },
       (sanitisedData, callback) => {
         if (!sanitisedData) {
-          return callback({  // eslint-disable-line standard/no-callback-literal
+          return callback({ // eslint-disable-line standard/no-callback-literal
             status: '404',
             code: 'EVERSION',
             title: 'Resource is not valid',

diff --git a/lib/routes/helper.js b/lib/routes/helper.js
@@ -13,7 +13,7 @@ helper.validate = (someObject, someDefinition, callback) => {
   debug.validationInput(JSON.stringify(someObject))
   Joi.validate(someObject, someDefinition, { abortEarly: false }, (err, sanitisedObject) => {
     if (err) {
-      return callback({  // eslint-disable-line standard/no-callback-literal
+      return callback({ // eslint-disable-line standard/no-callback-literal
         status: '403',
         code: 'EFORBIDDEN',
         title: 'Param validation failed',
@@ -27,7 +27,7 @@ helper.validate = (someObject, someDefinition, callback) => {
 
 helper.checkForBody = (request, callback) => {
   if (!request.params.data) {
-    return callback({  // eslint-disable-line standard/no-callback-literal
+    return callback({ // eslint-disable-line standard/no-callback-literal
       status: '403',
       code: 'EFORBIDDEN',
       title: 'Request validation failed',
@@ -36,7 +36,7 @@ helper.checkForBody = (request, callback) => {
   }
   // data can be {} or [] both of which are typeof === 'object'
   if (typeof request.params.data !== 'object') {
-    return callback({  // eslint-disable-line standard/no-callback-literal
+    return callback({ // eslint-disable-line standard/no-callback-literal
       status: '403',
       code: 'EFORBIDDEN',
       title: 'Request validation failed',

diff --git a/lib/routes/related.js b/lib/routes/related.js
@@ -25,15 +25,15 @@ relatedRoute.register = () => {
       callback => {
         relation = resourceConfig.attributes[request.params.relation]
         if (!relation || !relation._settings || !(relation._settings.__one || relation._settings.__many)) {
-          return callback({  // eslint-disable-line standard/no-callback-literal
+          return callback({ // eslint-disable-line standard/no-callback-literal
             status: '404',
             code: 'ENOTFOUND',
             title: 'Resource not found',
             detail: 'The requested relation does not exist within the requested type'
           })
         }
         if (relation._settings.__as) {
-          return callback({  // eslint-disable-line standard/no-callback-literal
+          return callback({ // eslint-disable-line standard/no-callback-literal
             status: '404',
             code: 'EFOREIGN',
             title: 'Relation is Foreign',

diff --git a/lib/routes/relationships.js b/lib/routes/relationships.js
@@ -22,7 +22,7 @@ relationshipsRoute.register = () => {
       callback => {
         const relation = resourceConfig.attributes[request.params.relation]
         if (!relation || !(relation._settings.__one || relation._settings.__many)) {
-          return callback({  // eslint-disable-line standard/no-callback-literal
+          return callback({ // eslint-disable-line standard/no-callback-literal
             status: '404',
             code: 'ENOTFOUND',
             title: 'Resource not found',
@@ -43,7 +43,7 @@ relationshipsRoute.register = () => {
       },
       (sanitisedData, callback) => {
         if (!sanitisedData) {
-          return callback({  // eslint-disable-line standard/no-callback-literal
+          return callback({ // eslint-disable-line standard/no-callback-literal
             status: '404',
             code: 'EVERSION',
             title: 'Resource is not valid',

diff --git a/lib/routes/removeRelation.js b/lib/routes/removeRelation.js
@@ -44,7 +44,7 @@ removeRelationRoute.register = () => {
 
         for (let i = 0; i < theirs.length; i++) {
           if (relationType.indexOf(theirs[i].type) === -1) {
-            return callback({  // eslint-disable-line standard/no-callback-literal
+            return callback({ // eslint-disable-line standard/no-callback-literal
               status: '403',
               code: 'EFORBIDDEN',
               title: 'Invalid Request',
@@ -54,7 +54,7 @@ removeRelationRoute.register = () => {
           const someId = theirs[i].id
           const indexOfTheirs = keys.indexOf(someId)
           if (indexOfTheirs === -1) {
-            return callback({  // eslint-disable-line standard/no-callback-literal
+            return callback({ // eslint-disable-line standard/no-callback-literal
               status: '403',
               code: 'EFORBIDDEN',
               title: 'Invalid Request',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsonapi-server",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A config driven NodeJS framework implementing json:api",
   "keywords": [
     "jsonapi",
@@ -19,30 +19,30 @@
     "node": ">=4.5"
   },
   "dependencies": {
-    "async": "2.4.1",
+    "async": "2.5.0",
     "body-parser": "1.17.2",
     "cookie-parser": "1.4.3",
     "debug": "2.6.8",
     "express": "4.15.3",
     "express-graphql": "0.5.4",
     "graphql": "0.7.2",
-    "joi": "10.5.2",
+    "joi": "10.6.0",
     "lodash.assign": "4.2.0",
     "lodash.isequal": "4.5.0",
     "lodash.omit": "4.5.0",
     "lodash.pick": "4.4.0",
     "lodash.uniq": "4.5.0",
     "lodash.uniqby": "4.7.0",
-    "qs": "6.4.0",
+    "qs": "6.5.0",
     "request": "2.81.0",
     "use-strict": "1.0.1",
-    "uuid": "3.0.1"
+    "uuid": "3.1.0"
   },
   "devDependencies": {
-    "eslint": "^3.6.1",
+    "eslint": "4.2.0",
     "eslint-config-standard": "10.2.1",
-    "eslint-plugin-import": "2.3.0",
-    "eslint-plugin-node": "4.2.2",
+    "eslint-plugin-import": "2.7.0",
+    "eslint-plugin-node": "5.1.0",
     "eslint-plugin-promise": "^3.3.0",
     "eslint-plugin-standard": "3.0.1",
     "istanbul": "0.4.5",