mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-21 16:13:12 +09:00
Bump winston@3.17 and resolve type error
This commit is contained in:
5 files changed
+13
-8
No files matched your search
@@ -29,7 +29,7 @@
|
|||||||
"jsonwebtoken": "^9.0.1",
|
"jsonwebtoken": "^9.0.1",
|
||||||
"jszip": "^3.10.1",
|
"jszip": "^3.10.1",
|
||||||
"set-blocking": "^2.0.0",
|
"set-blocking": "^2.0.0",
|
||||||
"winston": "^3.10.0",
|
"winston": "^3.17.0",
|
||||||
"winston-daily-rotate-file": "^4.7.1",
|
"winston-daily-rotate-file": "^4.7.1",
|
||||||
"ws": "^8.13.0",
|
"ws": "^8.13.0",
|
||||||
"yargs": "^17.7.2"
|
"yargs": "^17.7.2"
|
||||||
@@ -52,9 +52,9 @@
|
|||||||
"react-router-dom": "^6.4.14",
|
"react-router-dom": "^6.4.14",
|
||||||
"typescript": "^5.5.3",
|
"typescript": "^5.5.3",
|
||||||
"webpack": "^5.88.2",
|
"webpack": "^5.88.2",
|
||||||
|
"webpack-cli": "^5.1.4",
|
||||||
"webpack-dev-middleware": "^6.1.1",
|
"webpack-dev-middleware": "^6.1.1",
|
||||||
"webpack-merge": "^5.9.0",
|
"webpack-merge": "^5.9.0"
|
||||||
"webpack-cli": "^5.1.4"
|
|
||||||
},
|
},
|
||||||
"publishConfig": {
|
"publishConfig": {
|
||||||
"access": "public"
|
"access": "public"
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
"fs-extra": "^11.1.1",
|
"fs-extra": "^11.1.1",
|
||||||
"phin": "^3.7.0",
|
"phin": "^3.7.0",
|
||||||
"set-blocking": "^2.0.0",
|
"set-blocking": "^2.0.0",
|
||||||
"winston": "^3.10.0",
|
"winston": "^3.17.0",
|
||||||
"yargs": "^17.7.2"
|
"yargs": "^17.7.2"
|
||||||
},
|
},
|
||||||
"publishConfig": {
|
"publishConfig": {
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
"rcon-client": "^4.2.3",
|
"rcon-client": "^4.2.3",
|
||||||
"semver": "^7.5.4",
|
"semver": "^7.5.4",
|
||||||
"set-blocking": "^2.0.0",
|
"set-blocking": "^2.0.0",
|
||||||
"winston": "^3.10.0",
|
"winston": "^3.17.0",
|
||||||
"winston-daily-rotate-file": "^4.7.1",
|
"winston-daily-rotate-file": "^4.7.1",
|
||||||
"yargs": "^17.7.2"
|
"yargs": "^17.7.2"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
"klaw": "^4.1.0",
|
"klaw": "^4.1.0",
|
||||||
"set-blocking": "^2.0.0",
|
"set-blocking": "^2.0.0",
|
||||||
"triple-beam": "^1.4.1",
|
"triple-beam": "^1.4.1",
|
||||||
"winston": "^3.10.0",
|
"winston": "^3.17.0",
|
||||||
"winston-transport": "^4.5.0",
|
"winston-transport": "^4.5.0",
|
||||||
"ws": "^8.13.0",
|
"ws": "^8.13.0",
|
||||||
"yargs": "^17.7.2"
|
"yargs": "^17.7.2"
|
||||||
|
|||||||
@@ -139,6 +139,10 @@ function formatServerOutput(parsed: ParsedFactorioOutput) {
|
|||||||
// These are defined here to avoid circular dependencies and pulling them
|
// These are defined here to avoid circular dependencies and pulling them
|
||||||
// into the web interface code.
|
// into the web interface code.
|
||||||
|
|
||||||
|
export interface TerminalFormatOptions extends winston.Logform.ColorizeOptions {
|
||||||
|
showTimestamp?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Formats winston log messages for a character terminal.
|
* Formats winston log messages for a character terminal.
|
||||||
*/
|
*/
|
||||||
@@ -146,12 +150,13 @@ export class TerminalFormat {
|
|||||||
colorize: winston.Logform.Colorizer;
|
colorize: winston.Logform.Colorizer;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
public options: object = {}
|
public options: TerminalFormatOptions = {}
|
||||||
) {
|
) {
|
||||||
this.colorize = winston.format.colorize(options);
|
this.colorize = winston.format.colorize(options);
|
||||||
}
|
}
|
||||||
|
|
||||||
transform(info: any, options: { showTimestamp: boolean }) {
|
transform(info: any, opts: unknown) {
|
||||||
|
const options = opts as TerminalFormatOptions;
|
||||||
info = this.colorize.transform(info, this.colorize.options);
|
info = this.colorize.transform(info, this.colorize.options);
|
||||||
let ts = "";
|
let ts = "";
|
||||||
if (options.showTimestamp && info.timestamp) {
|
if (options.showTimestamp && info.timestamp) {
|
||||||
|
|||||||
Reference in new issue
Block a user