@autofleet/super-express 1.1.21-beta-3 → 2.0.0

package/index.js

@@ -1,46 +1,27 @@
-const express = require('express')
+import express from 'express';
+import helmet from 'helmet';
+import morgan from 'morgan';
 
-const chalk = require('chalk');
+import defaultOptions from './default-options.json';
 
-const helmet = require('helmet')
-const bodyParser = require('body-parser')
-const morgan = require('morgan')
+export default function(options = {}) {
+    const app = express(options);
+    const isProd = process.env.NODE_ENV === 'production';
+    const mergedOptions = Object.assign({}, defaultOptions, options);
 
-const defaultOptions = require('./default-options.json')
-
-module.exports = function(options = {}) {
-    const app = express(options)
-
-    const isProd = process.env.NODE_ENV === 'production'
-    const isStage = process.env.NODE_ENV === 'staging'
-    const mergedOptions = Object.assign({}, defaultOptions, options)
-
-    if (options.httpLogCb) {
-        app.use(morgan((tokens, req, res) => {
-            options.httpLogCb({
-                method: tokens.method(req, res),
-                url: tokens.url(req, res),
-                status: tokens.status(req, res),
-                'content-length': tokens.res(req, res, 'content-length'),
-                'response-time': tokens['response-time'](req, res),
-                'user-agent': tokens['user-agent'](req, res),
-            })
-        }))
+    app.use(morgan(':method :url :status :res[content-length] - :response-time ms'));
+    app.use(helmet());
+    if (mergedOptions.bodyParser) {
+        app.use(express.json({ limit: '1000mb' }))
     } else {
-        app.use(morgan(':method :url :status :res[content-length] - :response-time ms'))
-    }
-
-    // General
-    // app.use(helmet());
-    if( mergedOptions.bodyParser ) {
-        app.use(bodyParser.json({ limit: '1000mb' }))
+        console.log('[SuperExpress] Body parser is disabled');
     }
 
     app.nativeListen = app.listen
     app.listen = function (port, cb) {
-        console.log(chalk.blue(`Super express will listen on port ${port}`))
-        console.log(chalk.blue(`Production mode: ${isProd}`))
-        return app.nativeListen(port, cb)
+        console.log(`[SuperExpress] will listen on port ${port}`);
+        console.log(`[SuperExpress] Production mode: ${isProd}`);
+        app.nativeListen(port, cb)
     }
 
     return app

package/package.json

@@ -1,16 +1,15 @@
 {
   "name": "@autofleet/super-express",
-  "version": "1.1.21-beta-3",
+  "version": "2.0.0",
   "description": "AF Express with built in boilerplate",
   "main": "index.js",
-  "author": "",
+  "type": "module",
+  "author": "Autofleet",
   "license": "MIT",
   "dependencies": {
-    "body-parser": "^1.19.0",
-    "chalk": "^2.4.1",
-    "express": "^4.17.1",
-    "helmet": "^4.6.0",
-    "morgan": "^1.10.0"
+    "express": "^4.19.2",
+    "helmet": "^3.21.2",
+    "morgan": "^1.9.1"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -22,5 +21,9 @@
   "bugs": {
     "url": "https://github.com/Autofleet/super-express/issues"
   },
-  "homepage": "https://github.com/Autofleet/super-express#readme"
+  "homepage": "https://github.com/Autofleet/super-express#readme",
+  "devDependencies": {
+    "@types/express": "^4.17.21",
+    "@types/helmet": "^4.0.0"
+  }
 }