gscan 4.49.1 → 4.49.3

package/app/index.js

@@ -1,3 +1,8 @@
+// Init Sentry middleware
+require('./middlewares/sentry');
+const sentry = require('@sentry/node');
+
+// Require rest of the modules
 const express = require('express');
 const debug = require('@tryghost/debug')('app');
 const hbs = require('express-hbs');
@@ -9,7 +14,6 @@ const gscan = require('../lib');
 const fs = require('fs-extra');
 const logRequest = require('./middlewares/log-request');
 const uploadValidation = require('./middlewares/upload-validation');
-const sentry = require('./middlewares/sentry');
 const ghostVer = require('./ghost-version');
 const pkgJson = require('../package.json');
 const ghostVersions = require('../lib/utils').versions;
@@ -17,8 +21,6 @@ const upload = multer({dest: __dirname + '/uploads/'});
 const app = express();
 const scanHbs = hbs.create();
 
-app.use(sentry.requestHandler);
-
 // Configure express
 app.set('x-powered-by', false);
 app.set('query parser', false);
@@ -89,8 +91,6 @@ app.post('/',
     }
 );
 
-app.use(sentry.errorHandler);
-
 app.use(function (req, res, next) {
     next(new errors.NotFoundError({message: 'Page not found'}));
 });
@@ -110,4 +110,6 @@ app.use(function (err, req, res, next) {
     res.render(template, {message: err.message, stack: err.stack, details: err.errorDetails, context: err.context});
 });
 
+sentry.setupExpressErrorHandler(app);
+
 server.start(app, config.get('port'));

package/app/middlewares/sentry.js

@@ -1,9 +1,5 @@
 const sentryDSN = process.env.SENTRY_DSN;
 
-const expressNoop = function (req, res, next) {
-    next();
-};
-
 if (sentryDSN) {
     const Sentry = require('@sentry/node');
     const version = require('../../package.json').version;
@@ -12,14 +8,4 @@ if (sentryDSN) {
         release: 'gscan@' + version,
         environment: process.env.NODE_ENV
     });
-
-    module.exports = {
-        requestHandler: Sentry.Handlers.requestHandler(),
-        errorHandler: Sentry.Handlers.errorHandler()
-    };
-} else {
-    module.exports = {
-        requestHandler: expressNoop,
-        errorHandler: expressNoop
-    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gscan",
-  "version": "4.49.1",
+  "version": "4.49.3",
   "description": "Scans Ghost themes looking for errors, deprecations, features and compatibility",
   "keywords": [
     "ghost",
@@ -71,12 +71,12 @@
     "c8": "8.0.1",
     "eslint": "8.1.0",
     "eslint-plugin-ghost": "2.1.0",
-    "mocha": "11.5.0",
+    "mocha": "11.7.0",
     "node-fetch": "3.3.2",
     "nodemon": "2.0.7",
     "rewire": "6.0.0",
     "should": "13.2.3",
-    "sinon": "20.0.0"
+    "sinon": "21.0.0"
   },
   "files": [
     "lib",