koa-better-error-handler - npm Package Compare versions

Comparing version 3.0.1 to 3.0.3

.nyc_output/processinfo/index.json

@@ -1,1 +0,1 @@
-{"processes":{"cda59ecf-3869-44a7-bb6f-25345e876788":{"parent":null,"children":["d48e8d1c-b1f4-4285-a78e-a8721177360c"]},"d48e8d1c-b1f4-4285-a78e-a8721177360c":{"parent":"cda59ecf-3869-44a7-bb6f-25345e876788","children":[]}},"files":{"/Users/jack/Projects/koa-better-error-handler/lib/index.js":["d48e8d1c-b1f4-4285-a78e-a8721177360c"]},"externalIds":{}}
+{"processes":{"ddb73522-3a22-4d09-a401-82c7e745339e":{"parent":null,"children":["f1b9c710-18d1-469d-921a-92f7b2ea9db5"]},"f1b9c710-18d1-469d-921a-92f7b2ea9db5":{"parent":"ddb73522-3a22-4d09-a401-82c7e745339e","children":[]}},"files":{"/Users/jack/Projects/koa-better-error-handler/lib/index.js":["f1b9c710-18d1-469d-921a-92f7b2ea9db5"]},"externalIds":{}}

lib/index.js

@@ -1,4 +0,40 @@
-'use strict';
+"use strict";
 
-// initialize try/catch error handling right away
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+const fs = require('fs');
+
+const path = require('path');
+
+const Boom = require('@hapi/boom');
+
+const Debug = require('debug');
+
+const _ = require('lodash');
+
+const capitalize = require('capitalize');
+
+const camelCase = require('camelcase');
+
+const co = require('co');
+
+const humanize = require('humanize-string');
+
+const statuses = require('statuses');
+
+const toIdentifier = require('toidentifier');
+
+const opts = {
+  encoding: 'utf8'
+}; // error pages were inspired by HTML5 Boilerplate's default 404.html page
+// https://github.com/h5bp/html5-boilerplate/blob/master/src/404.html
+
+const _404 = fs.readFileSync(path.join(__dirname, '..', '404.html'), opts);
+
+const _500 = fs.readFileSync(path.join(__dirname, '..', '500.html'), opts);
+
+const debug = new Debug('koa-better-error-handler');
+const passportLocalMongooseErrorNames = ['AuthenticationError', 'MissingPasswordError', 'AttemptTooSoonError', 'TooManyAttemptsError', 'NoSaltValueStoredError', 'IncorrectPasswordError', 'IncorrectUsernameError', 'MissingUsernameError', 'UserExistsError']; // initialize try/catch error handling right away
 // adapted from: https://github.com/koajs/onerror/blob/master/index.js
@@ -10,10 +46,12 @@ // https://github.com/koajs/examples/issues/20#issuecomment-31568401
 // https://goo.gl/8Z7aMe
+// eslint-disable-next-line complexity
 
-// eslint-disable-next-line complexity
-let errorHandler = (() => {
-  var _ref = _asyncToGenerator(function* (err) {
+function errorHandler(_x) {
+  return _errorHandler.apply(this, arguments);
+}
+
+function _errorHandler() {
+  _errorHandler = _asyncToGenerator(function* (err) {
     if (!err) return;
-
     if (!_.isError(err)) err = new Error(err);
-
     const type = this.accepts(['text', 'json', 'html']);
@@ -25,35 +63,30 @@
       err.message = Boom.notAcceptable().output.payload;
-    }
+    } // parse mongoose validation errors
 
-    // parse mongoose validation errors
-    err = parseValidationError(this, err);
 
-    // check if we threw just a status code in order to keep it simple
+    err = parseValidationError(this, err); // check if we threw just a status code in order to keep it simple
+
     const val = parseInt(err.message, 10);
-    if (_.isNumber(val) && val >= 400) err = Boom.create(val);
+    if (_.isNumber(val) && val >= 400) err = Boom[camelCase(toIdentifier(statuses[val]))](); // check if we have a boom error that specified
+    // a status code already for us (and then use it)
 
-    // check if we have a boom error that specified
-    // a status code already for us (and then use it)
     if (_.isObject(err.output) && _.isNumber(err.output.statusCode)) err.status = err.output.statusCode;
+    if (!_.isNumber(err.status)) err.status = 500; // check if there is flash messaging
 
-    if (!_.isNumber(err.status)) err.status = 500;
-
-    // check if there is flash messaging
     const hasFlash = _.isFunction(this.flash);
-    debug('hasFlash', hasFlash);
 
-    // check if there is session support
+    debug('hasFlash', hasFlash); // check if there is session support
+
     const hasSessions = _.isObject(this.session) && _.isObject(this.sessionStore) && _.isString(this.sessionId) && _.isObject(this.session) && _.isFunction(this.sessionStore.set);
-    debug('hasSessions', hasSessions);
 
-    // check if there is a view rendering engine binding `this.render`
+    debug('hasSessions', hasSessions); // check if there is a view rendering engine binding `this.render`
+
     const hasRender = _.isFunction(this.render);
-    debug('hasRender', hasRender);
 
-    // check if we're about to go into a possible endless redirect loop
-    const noReferrer = this.get('Referrer') === '';
+    debug('hasRender', hasRender); // check if we're about to go into a possible endless redirect loop
 
-    // nothing we can do here other
+    const noReferrer = this.get('Referrer') === ''; // nothing we can do here other
     // than delegate to the app-level
     // handler and log.
+
     if (this.headerSent || !this.writable) {
@@ -63,6 +96,6 @@ debug('headers were already sent, returning early');
       return;
-    }
+    } // populate the status and body with `boom` error message payload
+    // (e.g. you can do `ctx.throw(404)` and it will output a beautiful err obj)
 
-    // populate the status and body with `boom` error message payload
-    // (e.g. you can do `ctx.throw(404)` and it will output a beautiful err obj)
+
     err.status = err.status || 500;
@@ -72,13 +105,11 @@ err.statusCode = err.status;
     this.status = this.statusCode;
-    this.body = Boom.create(err.status, err.message).output.payload;
+    this.body = new Boom(err.message, {
+      statusCode: err.status
+    }).output.payload; // set any additional error headers specified
+    // (e.g. for BasicAuth we use `basic-auth` which specifies WWW-Authenticate)
 
-    // set any additional error headers specified
-    // (e.g. for BasicAuth we use `basic-auth` which specifies WWW-Authenticate)
     if (_.isObject(err.headers) && Object.keys(err.headers).length > 0) this.set(err.headers);
-
     debug('status code was %d', this.status);
+    this.app.emit('error', err, this); // fix page title and description
 
-    this.app.emit('error', err, this);
-
-    // fix page title and description
     this.state.meta = this.state.meta || {};
@@ -89,3 +120,2 @@ this.state.meta.title = this.body.error;
     debug('set `this.state.meta.desc` to %s', this.state.meta.description);
-
     debug('type was %s', type);
@@ -115,8 +145,6 @@
           // would endlessly rediret the user with `this.redirect('back')`
-          if (noReferrer) debug('prevented endless redirect loop!');
+          if (noReferrer) debug('prevented endless redirect loop!'); // flash an error message
 
-          // flash an error message
-          if (hasFlash) this.flash('error', err.message);
+          if (hasFlash) this.flash('error', err.message); // render the 500 page
 
-          // render the 500 page
           if (hasRender) {
@@ -135,6 +163,5 @@ try {
           // flash an error message
-          if (hasFlash) this.flash('error', err.message);
+          if (hasFlash) this.flash('error', err.message); // TODO: until the issue is resolved, we need to add this here
+          // <https://github.com/koajs/generic-session/pull/95#issuecomment-246308544>
 
-          // TODO: until the issue is resolved, we need to add this here
-          // <https://github.com/koajs/generic-session/pull/95#issuecomment-246308544>
           if (this.sessionStore && this.sessionId && this.session && this.state.cookiesKey) {
@@ -144,3 +171,2 @@ yield co.wrap(this.sessionStore.set).call(this.sessionStore, this.sessionId, this.session);
           }
-
           /*
@@ -158,4 +184,5 @@ // if we're using `koa-session-store` we need to add
           */
+          // redirect the user to the page they were just on
 
-          // redirect the user to the page they were just on
+
           this.redirect('back');
@@ -165,2 +192,3 @@ }
         break;
+
       case 'json':
@@ -170,2 +198,3 @@ this.type = 'json';
         break;
+
       default:
@@ -180,63 +209,35 @@ this.type = this.api ? 'json' : 'text';
   });
+  return _errorHandler.apply(this, arguments);
+}
 
-  return function errorHandler(_x) {
-    return _ref.apply(this, arguments);
-  };
-})();
+function parseValidationError(ctx, err) {
+  // translate messages
+  const translate = message => _.isFunction(ctx.request.t) ? ctx.request.t(message) : message; // passport-local-mongoose support
 
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
 
-const fs = require('fs');
-const path = require('path');
-const s = require('underscore.string');
-const co = require('co');
-const Debug = require('debug');
-const _ = require('lodash');
-const Boom = require('boom');
+  if (passportLocalMongooseErrorNames.includes(err.name)) {
+    err.message = translate(err.message); // this ensures the error shows up client-side
 
-const opts = {
-  encoding: 'utf8'
-};
+    err.status = 400; // 429 = too many requests
 
-// error pages were inspired by HTML5 Boilerplate's default 404.html page
-// https://github.com/h5bp/html5-boilerplate/blob/master/src/404.html
-const _404 = fs.readFileSync(path.join(__dirname, '..', '404.html'), opts);
-const _500 = fs.readFileSync(path.join(__dirname, '..', '500.html'), opts);
-
-const debug = new Debug('koa-better-error-handler');
-
-const passportLocalMongooseErrorNames = ['AuthenticationError', 'MissingPasswordError', 'AttemptTooSoonError', 'TooManyAttemptsError', 'NoSaltValueStoredError', 'IncorrectPasswordError', 'IncorrectUsernameError', 'MissingUsernameError', 'UserExistsError'];
-
-function parseValidationError(ctx, err) {
-  // translate messages
-  const translate = message => _.isFunction(ctx.request.t) ? ctx.request.t(message) : message;
-
-  // passport-local-mongoose support
-  if (passportLocalMongooseErrorNames.includes(err.name)) {
-    err.message = translate(err.message);
-    // this ensures the error shows up client-side
-    err.status = 400;
-    // 429 = too many requests
     if (['AttemptTooSoonError', 'TooManyAttemptsError'].includes(err.name)) err.status = 429;
     return err;
-  }
+  } // inspired by https://github.com/syntagma/mongoose-error-helper
 
-  // inspired by https://github.com/syntagma/mongoose-error-helper
-  if (err.name !== 'ValidationError') return err;
 
-  // transform the error messages to be humanized as adapted from:
+  if (err.name !== 'ValidationError') return err; // transform the error messages to be humanized as adapted from:
   // https://github.com/niftylettuce/mongoose-validation-error-transform
+
   err.errors = _.map(err.errors, error => {
     if (!_.isString(error.path)) {
-      error.message = s.capitalize(error.message);
+      error.message = capitalize(error.message);
       return error;
     }
 
-    error.message = error.message.replace(new RegExp(error.path, 'g'), s.humanize(error.path));
-    error.message = s.capitalize(error.message);
+    error.message = error.message.replace(new RegExp(error.path, 'g'), humanize(error.path));
+    error.message = capitalize(error.message);
     return error;
-  });
+  }); // loop over the errors object of the Validation Error
+  // with support for HTML error lists
 
-  // loop over the errors object of the Validation Error
-  // with support for HTML error lists
   if (_.values(err.errors).length === 1) {
@@ -246,12 +247,11 @@ err.message = translate(_.values(err.errors)[0].message);
     const errors = _.map(_.map(_.values(err.errors), 'message'), translate);
+
     err.message = ctx.api ? errors.join(', ') : `<ul class="text-left mb-0"><li>${errors.join('</li><li>')}</li></ul>`;
-  }
+  } // this ensures the error shows up client-side
 
-  // this ensures the error shows up client-side
+
   err.status = 400;
-
   return err;
 }
 
-module.exports = errorHandler;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/index.js"],"names":["err","_","isError","Error","type","accepts","debug","status","message","Boom","notAcceptable","output","payload","parseValidationError","val","parseInt","isNumber","create","isObject","statusCode","hasFlash","isFunction","flash","hasSessions","session","sessionStore","isString","sessionId","set","hasRender","render","noReferrer","get","headerSent","writable","body","headers","Object","keys","length","app","emit","state","meta","title","error","description","err2","_404","_500","cookiesKey","co","wrap","call","cookies","cookie","redirect","JSON","stringify","api","Buffer","byteLength","res","end","errorHandler","fs","require","path","s","Debug","opts","encoding","readFileSync","join","__dirname","passportLocalMongooseErrorNames","ctx","translate","request","t","includes","name","errors","map","capitalize","replace","RegExp","humanize","values","module","exports"],"mappings":"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","file":"index.js","sourcesContent":["const fs = require('fs');\nconst path = require('path');\nconst s = require('underscore.string');\nconst co = require('co');\nconst Debug = require('debug');\nconst _ = require('lodash');\nconst Boom = require('boom');\n\nconst opts = {\n  encoding: 'utf8'\n};\n\n// error pages were inspired by HTML5 Boilerplate's default 404.html page\n// https://github.com/h5bp/html5-boilerplate/blob/master/src/404.html\nconst _404 = fs.readFileSync(path.join(__dirname, '..', '404.html'), opts);\nconst _500 = fs.readFileSync(path.join(__dirname, '..', '500.html'), opts);\n\nconst debug = new Debug('koa-better-error-handler');\n\nconst passportLocalMongooseErrorNames = [\n  'AuthenticationError',\n  'MissingPasswordError',\n  'AttemptTooSoonError',\n  'TooManyAttemptsError',\n  'NoSaltValueStoredError',\n  'IncorrectPasswordError',\n  'IncorrectUsernameError',\n  'MissingUsernameError',\n  'UserExistsError'\n];\n\n// initialize try/catch error handling right away\n// adapted from: https://github.com/koajs/onerror/blob/master/index.js\n// https://github.com/koajs/examples/issues/20#issuecomment-31568401\n//\n// inspired by:\n// https://goo.gl/62oU7P\n// https://goo.gl/8Z7aMe\n\n// eslint-disable-next-line complexity\nasync function errorHandler(err) {\n  if (!err) return;\n\n  if (!_.isError(err)) err = new Error(err);\n\n  const type = this.accepts(['text', 'json', 'html']);\n\n  if (!type) {\n    debug('invalid type, sending 406 error');\n    err.status = 406;\n    err.message = Boom.notAcceptable().output.payload;\n  }\n\n  // parse mongoose validation errors\n  err = parseValidationError(this, err);\n\n  // check if we threw just a status code in order to keep it simple\n  const val = parseInt(err.message, 10);\n  if (_.isNumber(val) && val >= 400) err = Boom.create(val);\n\n  // check if we have a boom error that specified\n  // a status code already for us (and then use it)\n  if (_.isObject(err.output) && _.isNumber(err.output.statusCode))\n    err.status = err.output.statusCode;\n\n  if (!_.isNumber(err.status)) err.status = 500;\n\n  // check if there is flash messaging\n  const hasFlash = _.isFunction(this.flash);\n  debug('hasFlash', hasFlash);\n\n  // check if there is session support\n  const hasSessions =\n    _.isObject(this.session) &&\n    _.isObject(this.sessionStore) &&\n    _.isString(this.sessionId) &&\n    _.isObject(this.session) &&\n    _.isFunction(this.sessionStore.set);\n  debug('hasSessions', hasSessions);\n\n  // check if there is a view rendering engine binding `this.render`\n  const hasRender = _.isFunction(this.render);\n  debug('hasRender', hasRender);\n\n  // check if we're about to go into a possible endless redirect loop\n  const noReferrer = this.get('Referrer') === '';\n\n  // nothing we can do here other\n  // than delegate to the app-level\n  // handler and log.\n  if (this.headerSent || !this.writable) {\n    debug('headers were already sent, returning early');\n    err.headerSent = true;\n    return;\n  }\n\n  // populate the status and body with `boom` error message payload\n  // (e.g. you can do `ctx.throw(404)` and it will output a beautiful err obj)\n  err.status = err.status || 500;\n  err.statusCode = err.status;\n  this.statusCode = err.statusCode;\n  this.status = this.statusCode;\n  this.body = Boom.create(err.status, err.message).output.payload;\n\n  // set any additional error headers specified\n  // (e.g. for BasicAuth we use `basic-auth` which specifies WWW-Authenticate)\n  if (_.isObject(err.headers) && Object.keys(err.headers).length > 0)\n    this.set(err.headers);\n\n  debug('status code was %d', this.status);\n\n  this.app.emit('error', err, this);\n\n  // fix page title and description\n  this.state.meta = this.state.meta || {};\n  this.state.meta.title = this.body.error;\n  this.state.meta.description = err.message;\n  debug('set `this.state.meta.title` to %s', this.state.meta.title);\n  debug('set `this.state.meta.desc` to %s', this.state.meta.description);\n\n  debug('type was %s', type);\n\n  switch (type) {\n    case 'html':\n      this.type = 'html';\n\n      if (this.status === 404) {\n        // render the 404 page\n        // https://github.com/koajs/koa/issues/646\n        if (hasRender) {\n          try {\n            debug('rendering 404 page');\n            await this.render('404');\n          } catch (err2) {\n            debug('could not find 404 page, using built-in 404 html');\n            this.body = _404;\n          }\n        } else {\n          this.body = _404;\n        }\n      } else if (noReferrer || this.status === 500) {\n        // this prevents a redirect loop by detecting an empty Referrer\n        // ...otherwise it would reach the next conditional block which\n        // would endlessly rediret the user with `this.redirect('back')`\n        if (noReferrer) debug('prevented endless redirect loop!');\n\n        // flash an error message\n        if (hasFlash) this.flash('error', err.message);\n\n        // render the 500 page\n        if (hasRender) {\n          try {\n            debug('rendering 500 page');\n            await this.render('500');\n          } catch (err2) {\n            debug('could not find 500 page, using built-in 500 html');\n            this.body = _500;\n          }\n        } else {\n          this.body = _500;\n        }\n      } else {\n        // flash an error message\n        if (hasFlash) this.flash('error', err.message);\n\n        // TODO: until the issue is resolved, we need to add this here\n        // <https://github.com/koajs/generic-session/pull/95#issuecomment-246308544>\n        if (\n          this.sessionStore &&\n          this.sessionId &&\n          this.session &&\n          this.state.cookiesKey\n        ) {\n          await co\n            .wrap(this.sessionStore.set)\n            .call(this.sessionStore, this.sessionId, this.session);\n          this.cookies.set(\n            this.state.cookiesKey,\n            this.sessionId,\n            this.session.cookie\n          );\n        }\n\n        /*\n        // if we're using `koa-session-store` we need to add\n        // `this._session = new Session()`, and then run this:\n        await co.wrap(this._session._store.save).call(\n          this._session._store,\n          this._session._sid,\n          JSON.stringify(this.session)\n        );\n        this.cookies.set(this._session._name, JSON.stringify({\n          _sid: this._session._sid\n        }), this._session._cookieOpts);\n        */\n\n        // redirect the user to the page they were just on\n        this.redirect('back');\n      }\n\n      break;\n    case 'json':\n      this.type = 'json';\n      this.body = JSON.stringify(this.body, null, 2);\n      break;\n    default:\n      this.type = this.api ? 'json' : 'text';\n      this.body = JSON.stringify(this.body, null, 2);\n      break;\n  }\n\n  this.length = Buffer.byteLength(this.body);\n  this.res.end(this.body);\n}\n\nfunction parseValidationError(ctx, err) {\n  // translate messages\n  const translate = message =>\n    _.isFunction(ctx.request.t) ? ctx.request.t(message) : message;\n\n  // passport-local-mongoose support\n  if (passportLocalMongooseErrorNames.includes(err.name)) {\n    err.message = translate(err.message);\n    // this ensures the error shows up client-side\n    err.status = 400;\n    // 429 = too many requests\n    if (['AttemptTooSoonError', 'TooManyAttemptsError'].includes(err.name))\n      err.status = 429;\n    return err;\n  }\n\n  // inspired by https://github.com/syntagma/mongoose-error-helper\n  if (err.name !== 'ValidationError') return err;\n\n  // transform the error messages to be humanized as adapted from:\n  // https://github.com/niftylettuce/mongoose-validation-error-transform\n  err.errors = _.map(err.errors, error => {\n    if (!_.isString(error.path)) {\n      error.message = s.capitalize(error.message);\n      return error;\n    }\n\n    error.message = error.message.replace(\n      new RegExp(error.path, 'g'),\n      s.humanize(error.path)\n    );\n    error.message = s.capitalize(error.message);\n    return error;\n  });\n\n  // loop over the errors object of the Validation Error\n  // with support for HTML error lists\n  if (_.values(err.errors).length === 1) {\n    err.message = translate(_.values(err.errors)[0].message);\n  } else {\n    const errors = _.map(_.map(_.values(err.errors), 'message'), translate);\n    err.message = ctx.api\n      ? errors.join(', ')\n      : `<ul class=\"text-left mb-0\"><li>${errors.join('</li><li>')}</li></ul>`;\n  }\n\n  // this ensures the error shows up client-side\n  err.status = 400;\n\n  return err;\n}\n\nmodule.exports = errorHandler;\n"]}
+module.exports = errorHandler;

package.json

 {
   "name": "koa-better-error-handler",
   "description": "A better error-handler for Lad and Koa.  Makes `ctx.throw` awesome (best used with koa-404-handler)",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "author": "Nick Baugh <[e-mail]>",
@@ -16,14 +16,19 @@ "bugs": "https://github.com/ladjs/koa-better-error-handler/issues",
   "dependencies": {
-    "boom": "5.1.0",
+    "@hapi/boom": "^7.4.3",
+    "camelcase": "^5.3.1",
+    "capitalize": "^2.0.0",
     "co": "^4.6.0",
     "debug": "^4.1.1",
+    "humanize-string": "^2.1.0",
     "lodash": "^4.17.15",
-    "underscore.string": "^3.3.5"
+    "statuses": "^1.5.0",
+    "toidentifier": "^1.0.0"
   },
   "devDependencies": {
+    "@babel/cli": "^7.5.5",
+    "@babel/core": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
     "@commitlint/cli": "^8.1.0",
     "@commitlint/config-conventional": "^8.1.0",
     "ava": "^2.3.0",
-    "babel-cli": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
     "codecov": "^3.5.0",
@@ -33,2 +38,3 @@ "cross-env": "^5.2.1",
     "eslint-config-xo-lass": "^1.0.3",
+    "eslint-plugin-node": "^10.0.0",
     "fixpack": "^2.3.1",
@@ -38,3 +44,3 @@ "husky": "^3.0.5",
     "koa-404-handler": "^0.0.2",
-    "koa-basic-auth": "https://github.com/niftylettuce/basic-auth",
+    "koa-basic-auth": "^4.0.0",
     "koa-connect-flash": "^0.1.2",
@@ -59,3 +65,3 @@ "koa-convert": "^1.2.0",
     "hooks": {
-      "pre-commit": "npm test",
+      "pre-commit": "lint-staged && npm test",
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
@@ -89,16 +95,14 @@ }
   "lint-staged": {
-    "linters": {
-      "*.js": [
-        "xo --fix",
-        "git add"
-      ],
-      "*.md": [
-        "remark . -qfo",
-        "git add"
-      ],
-      "package.json": [
-        "fixpack",
-        "git add"
-      ]
-    }
+    "*.js": [
+      "xo --fix",
+      "git add"
+    ],
+    "*.md": [
+      "remark . -qfo",
+      "git add"
+    ],
+    "package.json": [
+      "fixpack",
+      "git add"
+    ]
   },
@@ -120,3 +124,3 @@ "main": "lib/index.js",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
-    "lint": "xo && remark . -qfo",
+    "lint": "xo && remark . -qfo && eslint --no-inline-config -c .lib.eslintrc lib",
     "precommit": "lint-staged && npm test",
@@ -123,0 +127,0 @@ "test": "npm run build && npm run lint && npm run test-coverage",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

52017

decreased by-27.98%

Dependency count

9

increased by80%

Dev dependency count

28

increased by7.69%

Number of package files

19

decreased by-5%

Lines of code

324

decreased by-4.42%

Dependency changes

• + Added@hapi/boom@^7.4.3

• + Addedcamelcase@^5.3.1

• + Addedcapitalize@^2.0.0

• + Addedhumanize-string@^2.1.0

• + Addedstatuses@^1.5.0

• + Addedtoidentifier@^1.0.0

• + Added@hapi/boom@7.4.11(transitive)

• + Added@hapi/hoek@8.5.1(transitive)

• + Addedcamelcase@5.3.1(transitive)

• + Addedcapitalize@2.0.4(transitive)

• + Addeddecamelize@2.0.0(transitive)

• + Addedhumanize-string@2.1.0(transitive)

• + Addedstatuses@1.5.0(transitive)

• + Addedtoidentifier@1.0.1(transitive)

• + Addedxregexp@4.0.0(transitive)

• - Removedboom@5.1.0

• - Removedunderscore.string@^3.3.5

• - Removedboom@5.1.0(transitive)

• - Removedhoek@4.3.1(transitive)

• - Removedsprintf-js@1.1.3(transitive)

• - Removedunderscore.string@3.3.6(transitive)

• - Removedutil-deprecate@1.0.2(transitive)