@tryghost/pretty-stream 0.1.27 → 0.1.29

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2013-2023 Ghost Foundation
+Copyright (c) 2013-2025 Ghost Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -37,4 +37,4 @@ Follow the instructions for the top-level repo.
 
 # Copyright & License 
 
-Copyright (c) 2013-2023 Ghost Foundation - Released under the [MIT license](LICENSE).
+Copyright (c) 2013-2025 Ghost Foundation - Released under the [MIT license](LICENSE).

package/lib/PrettyStream.js

@@ -1,14 +1,15 @@
-const moment = require('moment');
+const dateFormat = require('date-format');
 const Transform = require('stream').Transform;
 const format = require('util').format;
 const prettyjson = require('prettyjson');
 const each = require('lodash/each');
-const omit = require('lodash/omit');
 const get = require('lodash/get');
 const isArray = require('lodash/isArray');
 const isEmpty = require('lodash/isEmpty');
 const isObject = require('lodash/isObject');
-const isString = require('lodash/isString');
+
+const OMITTED_KEYS = ['time', 'level', 'name', 'hostname', 'pid', 'v', 'msg'];
+
 const _private = {
     levelFromName: {
         10: 'trace',
@@ -83,7 +84,7 @@ class PrettyStream extends Transform {
     }
 
     _transform(data, enc, cb) {
-        if (!isString(data)) {
+        if (typeof data !== 'string') {
             data = data.toString();
         }
 
@@ -99,7 +100,19 @@ class PrettyStream extends Transform {
         }
 
         let output = '';
-        const time = moment(data.time).format('YYYY-MM-DD HH:mm:ss');
+
+        // Convert the time to UTC
+        const now = new Date();
+        const dataTime = new Date(data.time || now);
+
+        // If the timezone offset is equal to the current timezone offset, and that timezone offset is not 0,
+        // then we need to adjust the time
+        if (dataTime.getTimezoneOffset() === now.getTimezoneOffset() && dataTime.getTimezoneOffset() !== 0) {
+            dataTime.setMinutes(dataTime.getMinutes() + dataTime.getTimezoneOffset());
+        }
+
+        const time = dateFormat.asString('yyyy-MM-dd hh:mm:ss', dataTime);
+
         let logLevel = _private.levelFromName[data.level].toUpperCase();
         const codes = _private.colors[_private.colorForLevel[data.level]];
         let bodyPretty = '';
@@ -125,7 +138,7 @@ class PrettyStream extends Transform {
             output += format('[%s] %s %s\n', time, logLevel, bodyPretty);
         }
 
-        each(omit(data, ['time', 'level', 'name', 'hostname', 'pid', 'v', 'msg']), function (value, key) {
+        each(Object.fromEntries(Object.entries(data).filter(([key]) => !OMITTED_KEYS.includes(key))), function (value, key) {
             // we always output errors for now
             if (isObject(value) && value.message && value.stack) {
                 let error = '\n';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/pretty-stream",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "repository": "https://github.com/TryGhost/framework/tree/main/packages/pretty-stream",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -19,15 +19,15 @@
     "access": "public"
   },
   "devDependencies": {
-    "c8": "10.1.2",
-    "mocha": "10.7.0",
+    "c8": "10.1.3",
+    "mocha": "10.7.3",
     "should": "13.2.3",
     "sinon": "18.0.0"
   },
   "dependencies": {
+    "date-format": "^4.0.14",
     "lodash": "^4.17.21",
-    "moment": "^2.29.1",
     "prettyjson": "^1.2.5"
   },
-  "gitHead": "d86b1d4fb719b9fb3535a31576c06e42ad1d8476"
+  "gitHead": "783b40c3ece6e1c9e293d09f2c069baa3e1110b2"
 }