From 661c6b04a76d1be33b5ff82a60b4993706366e8f Mon Sep 17 00:00:00 2001 From: tlylt Date: Sun, 17 Apr 2022 15:42:19 +0800 Subject: [PATCH 1/7] Update logger deps --- package-lock.json | 395 +++++++++++++++--------------- packages/cli/package.json | 4 +- packages/cli/src/util/logger.js | 6 + packages/core/package.json | 2 +- packages/core/src/utils/logger.js | 2 + 5 files changed, 205 insertions(+), 204 deletions(-) diff --git a/package-lock.json b/package-lock.json index 25faa0fe9d..60815ec97a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -86,8 +86,8 @@ "webpack-dev-middleware": "^3.7.2", "webpack-hot-middleware": "^2.25.0", "webpack-merge": "^5.0.9", - "winston": "^2.4.4", - "winston-daily-rotate-file": "^3.10.0" + "winston": "^3.7.2", + "winston-daily-rotate-file": "^4.5.0" }, "devDependencies": { "eslint": "^7.32.0", @@ -1783,6 +1783,16 @@ "node": ">=0.1.90" } }, + "node_modules/@dabh/diagnostics": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", + "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", + "dependencies": { + "colorspace": "1.1.x", + "enabled": "2.0.x", + "kuler": "^2.0.0" + } + }, "node_modules/@eslint/eslintrc": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", @@ -7108,6 +7118,15 @@ "node": ">=0.1.90" } }, + "node_modules/colorspace": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", + "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", + "dependencies": { + "color": "^3.1.3", + "text-hex": "1.0.x" + } + }, "node_modules/columnify": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz", @@ -8131,14 +8150,6 @@ "node": ">=0.10.0" } }, - "node_modules/cycle": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", - "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/cyclist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", @@ -8740,6 +8751,11 @@ "node": ">= 4" } }, + "node_modules/enabled": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", + "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" + }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -9911,14 +9927,6 @@ "node >=0.6.0" ] }, - "node_modules/eyes": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=", - "engines": { - "node": "> 0.1.90" - } - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -9973,11 +9981,6 @@ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, - "node_modules/fast-safe-stringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", - "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" - }, "node_modules/fastmatter": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/fastmatter/-/fastmatter-2.1.1.tgz", @@ -10009,9 +10012,9 @@ } }, "node_modules/fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", + "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==" }, "node_modules/figgy-pudding": { "version": "3.5.2", @@ -10095,11 +10098,11 @@ } }, "node_modules/file-stream-rotator": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.4.1.tgz", - "integrity": "sha512-W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.6.1.tgz", + "integrity": "sha512-u+dBid4PvZw17PmDeRcNOtCP9CCK/9lRN2w+r1xIS7yOL9JFrIBKTvrYsxT4P0pGtThYTn++QS5ChHaUov3+zQ==", "dependencies": { - "moment": "^2.11.2" + "moment": "^2.29.1" } }, "node_modules/file-uri-to-path": { @@ -10369,6 +10372,11 @@ "safe-buffer": "~5.1.0" } }, + "node_modules/fn.name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", + "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" + }, "node_modules/for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -13018,7 +13026,8 @@ "node_modules/isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true }, "node_modules/istanbul-lib-coverage": { "version": "3.2.0", @@ -14876,6 +14885,11 @@ "integrity": "sha512-Vi3nxDGMm/z+lAaCjvAR1u+7fiv+sG6gU/iYDj5QOF8h76ytK9EW/EKfF0NeTyiGBi8Jy6Hklty/vxISrLox3w==", "dev": true }, + "node_modules/kuler": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", + "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==" + }, "node_modules/last-call-webpack-plugin": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz", @@ -15397,15 +15411,15 @@ } }, "node_modules/logform": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz", - "integrity": "sha512-em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz", + "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==", "dependencies": { - "colors": "^1.2.1", - "fast-safe-stringify": "^2.0.4", - "fecha": "^2.3.3", + "@colors/colors": "1.5.0", + "fecha": "^4.2.0", "ms": "^2.1.1", - "triple-beam": "^1.2.0" + "safe-stable-stringify": "^2.3.1", + "triple-beam": "^1.3.0" } }, "node_modules/longest-streak": { @@ -17093,11 +17107,11 @@ } }, "node_modules/object-hash": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz", - "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz", + "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==", "engines": { - "node": ">= 0.10.0" + "node": ">= 6" } }, "node_modules/object-inspect": { @@ -17234,6 +17248,14 @@ "wrappy": "1" } }, + "node_modules/one-time": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", + "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", + "dependencies": { + "fn.name": "1.x.x" + } + }, "node_modules/onetime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", @@ -21958,6 +21980,11 @@ "node": ">=0.10" } }, + "node_modules/text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -24209,59 +24236,40 @@ } }, "node_modules/winston": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.5.tgz", - "integrity": "sha512-TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A==", - "dependencies": { - "async": "~1.0.0", - "colors": "1.0.x", - "cycle": "1.0.x", - "eyes": "0.1.x", - "isstream": "0.1.x", - "stack-trace": "0.0.x" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/winston-compat": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.5.tgz", - "integrity": "sha512-EPvPcHT604AV3Ji6d3+vX8ENKIml9VSxMRnPQ+cuK/FX6f3hvPP2hxyoeeCOCFvDrJEujalfcKWlWPvAnFyS9g==", + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.7.2.tgz", + "integrity": "sha512-QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng==", "dependencies": { - "cycle": "~1.0.3", - "logform": "^1.6.0", - "triple-beam": "^1.2.0" + "@dabh/diagnostics": "^2.0.2", + "async": "^3.2.3", + "is-stream": "^2.0.0", + "logform": "^2.4.0", + "one-time": "^1.0.0", + "readable-stream": "^3.4.0", + "safe-stable-stringify": "^2.3.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.5.0" }, "engines": { - "node": ">= 6.4.0" + "node": ">= 12.0.0" } }, "node_modules/winston-daily-rotate-file": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.10.0.tgz", - "integrity": "sha512-KO8CfbI2CvdR3PaFApEH02GPXiwJ+vbkF1mCkTlvRIoXFI8EFlf1ACcuaahXTEiDEKCii6cNe95gsL4ZkbnphA==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.6.1.tgz", + "integrity": "sha512-Ycch4LZmTycbhgiI2eQXBKI1pKcEQgAqmBjyq7/dC6Dk77nasdxvhLKraqTdCw7wNDSs8/M0jXaLATHquG7xYg==", "dependencies": { - "file-stream-rotator": "^0.4.1", - "object-hash": "^1.3.0", - "semver": "^6.2.0", + "file-stream-rotator": "^0.6.1", + "object-hash": "^2.0.1", "triple-beam": "^1.3.0", - "winston-compat": "^0.1.4", - "winston-transport": "^4.2.0" + "winston-transport": "^4.4.0" }, "engines": { - "node": ">=6" + "node": ">=8" }, "peerDependencies": { - "winston": "^2 || ^3" - } - }, - "node_modules/winston-daily-rotate-file/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "bin": { - "semver": "bin/semver.js" + "winston": "^3" } }, "node_modules/winston-transport": { @@ -24277,34 +24285,20 @@ "node": ">= 6.4.0" } }, - "node_modules/winston-transport/node_modules/fecha": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz", - "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q==" - }, - "node_modules/winston-transport/node_modules/logform": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz", - "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==", - "dependencies": { - "@colors/colors": "1.5.0", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^2.3.1", - "triple-beam": "^1.3.0" - } - }, "node_modules/winston/node_modules/async": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=" + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" }, - "node_modules/winston/node_modules/colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", + "node_modules/winston/node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "engines": { - "node": ">=0.1.90" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/word-wrap": { @@ -25855,6 +25849,16 @@ "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==" }, + "@dabh/diagnostics": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", + "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", + "requires": { + "colorspace": "1.1.x", + "enabled": "2.0.x", + "kuler": "^2.0.0" + } + }, "@eslint/eslintrc": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", @@ -30298,6 +30302,15 @@ "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" }, + "colorspace": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", + "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", + "requires": { + "color": "^3.1.3", + "text-hex": "1.0.x" + } + }, "columnify": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz", @@ -31142,11 +31155,6 @@ "array-find-index": "^1.0.1" } }, - "cycle": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", - "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=" - }, "cyclist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", @@ -31639,6 +31647,11 @@ "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" }, + "enabled": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", + "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" + }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -32549,11 +32562,6 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "dev": true }, - "eyes": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=" - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -32606,11 +32614,6 @@ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, - "fast-safe-stringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", - "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" - }, "fastmatter": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/fastmatter/-/fastmatter-2.1.1.tgz", @@ -32639,9 +32642,9 @@ } }, "fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", + "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==" }, "figgy-pudding": { "version": "3.5.2", @@ -32700,11 +32703,11 @@ } }, "file-stream-rotator": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.4.1.tgz", - "integrity": "sha512-W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.6.1.tgz", + "integrity": "sha512-u+dBid4PvZw17PmDeRcNOtCP9CCK/9lRN2w+r1xIS7yOL9JFrIBKTvrYsxT4P0pGtThYTn++QS5ChHaUov3+zQ==", "requires": { - "moment": "^2.11.2" + "moment": "^2.29.1" } }, "file-uri-to-path": { @@ -32926,6 +32929,11 @@ } } }, + "fn.name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", + "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -34969,7 +34977,8 @@ "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true }, "istanbul-lib-coverage": { "version": "3.2.0", @@ -36326,6 +36335,11 @@ "integrity": "sha512-Vi3nxDGMm/z+lAaCjvAR1u+7fiv+sG6gU/iYDj5QOF8h76ytK9EW/EKfF0NeTyiGBi8Jy6Hklty/vxISrLox3w==", "dev": true }, + "kuler": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", + "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==" + }, "last-call-webpack-plugin": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz", @@ -36780,15 +36794,15 @@ } }, "logform": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz", - "integrity": "sha512-em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz", + "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==", "requires": { - "colors": "^1.2.1", - "fast-safe-stringify": "^2.0.4", - "fecha": "^2.3.3", + "@colors/colors": "1.5.0", + "fecha": "^4.2.0", "ms": "^2.1.1", - "triple-beam": "^1.2.0" + "safe-stable-stringify": "^2.3.1", + "triple-beam": "^1.3.0" } }, "longest-streak": { @@ -38196,9 +38210,9 @@ } }, "object-hash": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz", - "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz", + "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==" }, "object-inspect": { "version": "1.12.0", @@ -38295,6 +38309,14 @@ "wrappy": "1" } }, + "one-time": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", + "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", + "requires": { + "fn.name": "1.x.x" + } + }, "onetime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", @@ -42104,6 +42126,11 @@ "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==", "dev": true }, + "text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" + }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -43920,58 +43947,43 @@ } }, "winston": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.5.tgz", - "integrity": "sha512-TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A==", + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.7.2.tgz", + "integrity": "sha512-QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng==", "requires": { - "async": "~1.0.0", - "colors": "1.0.x", - "cycle": "1.0.x", - "eyes": "0.1.x", - "isstream": "0.1.x", - "stack-trace": "0.0.x" + "@dabh/diagnostics": "^2.0.2", + "async": "^3.2.3", + "is-stream": "^2.0.0", + "logform": "^2.4.0", + "one-time": "^1.0.0", + "readable-stream": "^3.4.0", + "safe-stable-stringify": "^2.3.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.5.0" }, "dependencies": { "async": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=" + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" }, - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=" + "is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" } } }, - "winston-compat": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.5.tgz", - "integrity": "sha512-EPvPcHT604AV3Ji6d3+vX8ENKIml9VSxMRnPQ+cuK/FX6f3hvPP2hxyoeeCOCFvDrJEujalfcKWlWPvAnFyS9g==", - "requires": { - "cycle": "~1.0.3", - "logform": "^1.6.0", - "triple-beam": "^1.2.0" - } - }, "winston-daily-rotate-file": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.10.0.tgz", - "integrity": "sha512-KO8CfbI2CvdR3PaFApEH02GPXiwJ+vbkF1mCkTlvRIoXFI8EFlf1ACcuaahXTEiDEKCii6cNe95gsL4ZkbnphA==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.6.1.tgz", + "integrity": "sha512-Ycch4LZmTycbhgiI2eQXBKI1pKcEQgAqmBjyq7/dC6Dk77nasdxvhLKraqTdCw7wNDSs8/M0jXaLATHquG7xYg==", "requires": { - "file-stream-rotator": "^0.4.1", - "object-hash": "^1.3.0", - "semver": "^6.2.0", + "file-stream-rotator": "^0.6.1", + "object-hash": "^2.0.1", "triple-beam": "^1.3.0", - "winston-compat": "^0.1.4", - "winston-transport": "^4.2.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } + "winston-transport": "^4.4.0" } }, "winston-transport": { @@ -43982,25 +43994,6 @@ "logform": "^2.3.2", "readable-stream": "^3.6.0", "triple-beam": "^1.3.0" - }, - "dependencies": { - "fecha": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz", - "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q==" - }, - "logform": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz", - "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==", - "requires": { - "@colors/colors": "1.5.0", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^2.3.1", - "triple-beam": "^1.3.0" - } - } } }, "word-wrap": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 375d27d5ce..5ad10619ac 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -38,8 +38,8 @@ "fs-extra": "^9.0.1", "live-server": "1.2.1", "lodash": "^4.17.15", - "winston": "^2.4.4", - "winston-daily-rotate-file": "^3.10.0" + "winston": "^3.7.2", + "winston-daily-rotate-file": "^4.5.0" }, "devDependencies": { "diff": "^4.0.1", diff --git a/packages/cli/src/util/logger.js b/packages/cli/src/util/logger.js index 693cc83e45..880be4064d 100644 --- a/packages/cli/src/util/logger.js +++ b/packages/cli/src/util/logger.js @@ -12,6 +12,7 @@ const consoleTransport = new (winston.transports.Console)({ humanReadableUnhandledException: true, level: 'info', showLevel: true, + format: winston.format.cli(), }); function useDebugConsole() { @@ -27,10 +28,15 @@ const dailyRotateFileTransport = new DailyRotateFile({ level: 'debug', maxFiles: 5, showLevel: true, + format: winston.format.combine( + winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), + winston.format.printf(info => `${info.timestamp} ${info.level} ${info.message}`), + ), }); // Reconfigure the default instance logger winston provides with DailyRotateFile for markbind-cli winston.configure({ + format: winston.format.errors(), exitOnError: false, transports: [ consoleTransport, diff --git a/packages/core/package.json b/packages/core/package.json index 55daee2afc..bfe6108195 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -66,7 +66,7 @@ "vue-server-renderer": "2.6.14", "vue-template-compiler": "2.6.14", "walk-sync": "^2.0.2", - "winston": "^2.4.4" + "winston": "^3.7.2" }, "devDependencies": { "jest": "^27.5.1", diff --git a/packages/core/src/utils/logger.js b/packages/core/src/utils/logger.js index d3b469e1cc..cd9df16bf8 100644 --- a/packages/core/src/utils/logger.js +++ b/packages/core/src/utils/logger.js @@ -6,9 +6,11 @@ const consoleTransport = new (winston.transports.Console)({ humanReadableUnhandledException: true, level: 'debug', showLevel: true, + format: winston.format.cli(), }); winston.configure({ + format: winston.format.errors(), exitOnError: false, transports: [consoleTransport], }); From 6ee31a92be7c3e8fd32a76045061eb4ab15c813c Mon Sep 17 00:00:00 2001 From: tlylt Date: Sun, 17 Apr 2022 15:49:20 +0800 Subject: [PATCH 2/7] Undo changes to time format --- packages/cli/src/util/logger.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/util/logger.js b/packages/cli/src/util/logger.js index 880be4064d..b9493aa12e 100644 --- a/packages/cli/src/util/logger.js +++ b/packages/cli/src/util/logger.js @@ -29,7 +29,7 @@ const dailyRotateFileTransport = new DailyRotateFile({ maxFiles: 5, showLevel: true, format: winston.format.combine( - winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), + winston.format.timestamp(), winston.format.printf(info => `${info.timestamp} ${info.level} ${info.message}`), ), }); From 32604350da667c5f4b3a88f81c1c4f14cb9aee8e Mon Sep 17 00:00:00 2001 From: tlylt Date: Mon, 18 Apr 2022 21:40:39 +0800 Subject: [PATCH 3/7] Patch node-progress --- .../core/src/lib/progress/node-progress.js | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/packages/core/src/lib/progress/node-progress.js b/packages/core/src/lib/progress/node-progress.js index 3178c0eeed..5e6a726686 100644 --- a/packages/core/src/lib/progress/node-progress.js +++ b/packages/core/src/lib/progress/node-progress.js @@ -1,6 +1,6 @@ /* eslint-disable */ /* - * Patch for node-progress to fix display issue in certain terminals. + * Patch #1 for node-progress to fix display issue in certain terminals. * Issue related: https://github.com/MarkBind/markbind/issues/416 * The **only** changes are based on the following PR and its comments: * https://github.com/visionmedia/node-progress/pull/168 @@ -8,6 +8,12 @@ * to fix the issue for markbind's usecase. */ +/* + * Patch #2 for node-progress to allow logging without disturbing the progress bar. + * The changes are based on the following PR: + * https://github.com/visionmedia/node-progress/pull/155 + */ + /*! * node-progress * Copyright(c) 2011 TJ Holowaychuk @@ -57,7 +63,7 @@ exports = module.exports = ProgressBar; function ProgressBar(fmt, options) { this.stream = options.stream || process.stderr; - // patch + // patch #1 // options.forceTTY is undefined in git-bash on mintty Windows if (!process.stderr.isTTY) { var tty = require('tty').WriteStream.prototype; @@ -256,3 +262,25 @@ ProgressBar.prototype.terminate = function () { this.stream.write('\n'); } }; + +// patch #2 Add interruptBegin & interruptEnd +/** + * Begin a interrupt so the user can manually write messages above the bar. + * + * @api public + */ + +ProgressBar.prototype.interruptBegin = function () { + this.stream.clearLine(); + this.stream.cursorTo(0); +}; + +/** + * End a interrupt, rendering the last draw again. + * + * @api public + */ + +ProgressBar.prototype.interruptEnd = function () { + this.stream.write(this.lastDraw); +}; // end patch From 93407c3ac65820e4eff5b21f4a3136e4f53e9c61 Mon Sep 17 00:00:00 2001 From: tlylt Date: Mon, 18 Apr 2022 21:41:25 +0800 Subject: [PATCH 4/7] Update progressBar and logger --- packages/cli/src/util/logger.js | 1 - packages/core/src/Site/index.js | 2 ++ packages/core/src/utils/logger.js | 49 +++++++++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/packages/cli/src/util/logger.js b/packages/cli/src/util/logger.js index b9493aa12e..ce0d3b8788 100644 --- a/packages/cli/src/util/logger.js +++ b/packages/cli/src/util/logger.js @@ -36,7 +36,6 @@ const dailyRotateFileTransport = new DailyRotateFile({ // Reconfigure the default instance logger winston provides with DailyRotateFile for markbind-cli winston.configure({ - format: winston.format.errors(), exitOnError: false, transports: [ consoleTransport, diff --git a/packages/core/src/Site/index.js b/packages/core/src/Site/index.js index ba116658db..203f702535 100644 --- a/packages/core/src/Site/index.js +++ b/packages/core/src/Site/index.js @@ -1093,6 +1093,7 @@ class Site { const pagesCount = pageGenerationTasks.reduce((acc, task) => acc + task.pages.length, 0); const progressBar = new ProgressBar(`[:bar] :current / ${pagesCount} pages built`, { total: pagesCount }); progressBar.render(); + logger.setProgressBar(progressBar); const startTime = new Date(); let isCompleted = true; @@ -1110,6 +1111,7 @@ class Site { isCompleted = await this.generatePagesAsyncThrottled(task.pages, progressBar); } + logger.removeProgressBar(); this.siteLinkManager.validateAllIntralinks(); }); return isCompleted; diff --git a/packages/core/src/utils/logger.js b/packages/core/src/utils/logger.js index cd9df16bf8..0bfe38f47a 100644 --- a/packages/core/src/utils/logger.js +++ b/packages/core/src/utils/logger.js @@ -1,5 +1,16 @@ +const isError = require('lodash/isError'); const winston = require('winston'); +let progressBar; + +const setProgressBar = (bar) => { + progressBar = bar; +}; + +const removeProgressBar = () => { + progressBar = null; +}; + const consoleTransport = new (winston.transports.Console)({ colorize: true, handleExceptions: true, @@ -10,15 +21,47 @@ const consoleTransport = new (winston.transports.Console)({ }); winston.configure({ - format: winston.format.errors(), exitOnError: false, transports: [consoleTransport], }); +// patch inability to print stacktrace https://github.com/winstonjs/winston/issues/1498#issuecomment-433680788 +winston.error = (err) => { + if (isError(err)) { + winston.log({ level: 'error', message: `${err.stack || err}` }); + } else { + winston.log({ level: 'error', message: err }); + } +}; + +// create a wrapper for error messages +const errorWrap = (input) => { + if (progressBar) { + progressBar.interruptBegin(); + winston.error(input); + progressBar.interruptEnd(); + } else { + winston.error(input); + } +}; + +// create a wrapper for warning messages +const warnWarp = (input) => { + if (progressBar) { + progressBar.interruptBegin(); + winston.warn(input); + progressBar.interruptEnd(); + } else { + winston.warn(input); + } +}; + module.exports = { - error: winston.error, - warn: winston.warn, + error: errorWrap, + warn: warnWarp, info: winston.info, verbose: winston.verbose, debug: winston.debug, + setProgressBar, + removeProgressBar, }; From 3d3e127fa9e0e4e387b2c6f43f7356c7c8ab9962 Mon Sep 17 00:00:00 2001 From: tlylt Date: Mon, 18 Apr 2022 22:03:55 +0800 Subject: [PATCH 5/7] Fix typo --- packages/core/src/utils/logger.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/core/src/utils/logger.js b/packages/core/src/utils/logger.js index 0bfe38f47a..e80b46e558 100644 --- a/packages/core/src/utils/logger.js +++ b/packages/core/src/utils/logger.js @@ -25,7 +25,8 @@ winston.configure({ transports: [consoleTransport], }); -// patch inability to print stacktrace https://github.com/winstonjs/winston/issues/1498#issuecomment-433680788 +// patch inability to print stack trace +// https://github.com/winstonjs/winston/issues/1498#issuecomment-433680788 winston.error = (err) => { if (isError(err)) { winston.log({ level: 'error', message: `${err.stack || err}` }); From c2f86ac55949af03c10c9df4c130b6bbe1c9bd14 Mon Sep 17 00:00:00 2001 From: tlylt Date: Sun, 1 May 2022 13:45:11 +0800 Subject: [PATCH 6/7] Revert version --- package-lock.json | 140 ++++++++++++++++---------------- packages/cli/package.json | 4 +- packages/cli/src/util/logger.js | 5 -- packages/core/package.json | 2 +- 4 files changed, 73 insertions(+), 78 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0c514ad3dc..f9331f7a20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10463,9 +10463,9 @@ } }, "node_modules/fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", + "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==" }, "node_modules/figgy-pudding": { "version": "3.5.2", @@ -15851,15 +15851,15 @@ } }, "node_modules/logform": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz", - "integrity": "sha512-em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz", + "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==", "dependencies": { - "colors": "^1.2.1", - "fast-safe-stringify": "^2.0.4", - "fecha": "^2.3.3", + "@colors/colors": "1.5.0", + "fecha": "^4.2.0", "ms": "^2.1.1", - "triple-beam": "^1.2.0" + "safe-stable-stringify": "^2.3.1", + "triple-beam": "^1.3.0" } }, "node_modules/longest-streak": { @@ -24790,11 +24790,11 @@ } }, "node_modules/winston": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.5.tgz", - "integrity": "sha512-TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.6.tgz", + "integrity": "sha512-J5Zu4p0tojLde8mIOyDSsmLmcP8I3Z6wtwpTDHx1+hGcdhxcJaAmG4CFtagkb+NiN1M9Ek4b42pzMWqfc9jm8w==", "dependencies": { - "async": "~1.0.0", + "async": "^3.2.3", "colors": "1.0.x", "cycle": "1.0.x", "eyes": "0.1.x", @@ -24818,6 +24818,23 @@ "node": ">= 6.4.0" } }, + "node_modules/winston-compat/node_modules/fecha": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", + "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + }, + "node_modules/winston-compat/node_modules/logform": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz", + "integrity": "sha512-em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg==", + "dependencies": { + "colors": "^1.2.1", + "fast-safe-stringify": "^2.0.4", + "fecha": "^2.3.3", + "ms": "^2.1.1", + "triple-beam": "^1.2.0" + } + }, "node_modules/winston-daily-rotate-file": { "version": "3.10.0", "resolved": "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.10.0.tgz", @@ -24858,27 +24875,10 @@ "node": ">= 6.4.0" } }, - "node_modules/winston-transport/node_modules/fecha": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.2.tgz", - "integrity": "sha512-5rOQWkBVz3FnYWTi/ELZmq4CoK1Pb+xKNZWuJRsOwo0+8DrP43CrWJtyLVvb5U7z7ggE5llahfDbLjaVNzXVJQ==" - }, - "node_modules/winston-transport/node_modules/logform": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz", - "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==", - "dependencies": { - "@colors/colors": "1.5.0", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^2.3.1", - "triple-beam": "^1.3.0" - } - }, "node_modules/winston/node_modules/async": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=" + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" }, "node_modules/winston/node_modules/colors": { "version": "1.0.3", @@ -33516,9 +33516,9 @@ } }, "fecha": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", - "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", + "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==" }, "figgy-pudding": { "version": "3.5.2", @@ -37657,15 +37657,15 @@ } }, "logform": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz", - "integrity": "sha512-em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz", + "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==", "requires": { - "colors": "^1.2.1", - "fast-safe-stringify": "^2.0.4", - "fecha": "^2.3.3", + "@colors/colors": "1.5.0", + "fecha": "^4.2.0", "ms": "^2.1.1", - "triple-beam": "^1.2.0" + "safe-stable-stringify": "^2.3.1", + "triple-beam": "^1.3.0" } }, "longest-streak": { @@ -44852,11 +44852,11 @@ } }, "winston": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.5.tgz", - "integrity": "sha512-TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.6.tgz", + "integrity": "sha512-J5Zu4p0tojLde8mIOyDSsmLmcP8I3Z6wtwpTDHx1+hGcdhxcJaAmG4CFtagkb+NiN1M9Ek4b42pzMWqfc9jm8w==", "requires": { - "async": "~1.0.0", + "async": "^3.2.3", "colors": "1.0.x", "cycle": "1.0.x", "eyes": "0.1.x", @@ -44865,9 +44865,9 @@ }, "dependencies": { "async": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=" + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" }, "colors": { "version": "1.0.3", @@ -44884,6 +44884,25 @@ "cycle": "~1.0.3", "logform": "^1.6.0", "triple-beam": "^1.2.0" + }, + "dependencies": { + "fecha": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", + "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" + }, + "logform": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz", + "integrity": "sha512-em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg==", + "requires": { + "colors": "^1.2.1", + "fast-safe-stringify": "^2.0.4", + "fecha": "^2.3.3", + "ms": "^2.1.1", + "triple-beam": "^1.2.0" + } + } } }, "winston-daily-rotate-file": { @@ -44914,25 +44933,6 @@ "logform": "^2.3.2", "readable-stream": "^3.6.0", "triple-beam": "^1.3.0" - }, - "dependencies": { - "fecha": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.2.tgz", - "integrity": "sha512-5rOQWkBVz3FnYWTi/ELZmq4CoK1Pb+xKNZWuJRsOwo0+8DrP43CrWJtyLVvb5U7z7ggE5llahfDbLjaVNzXVJQ==" - }, - "logform": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz", - "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==", - "requires": { - "@colors/colors": "1.5.0", - "fecha": "^4.2.0", - "ms": "^2.1.1", - "safe-stable-stringify": "^2.3.1", - "triple-beam": "^1.3.0" - } - } } }, "word-wrap": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 5ad10619ac..375d27d5ce 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -38,8 +38,8 @@ "fs-extra": "^9.0.1", "live-server": "1.2.1", "lodash": "^4.17.15", - "winston": "^3.7.2", - "winston-daily-rotate-file": "^4.5.0" + "winston": "^2.4.4", + "winston-daily-rotate-file": "^3.10.0" }, "devDependencies": { "diff": "^4.0.1", diff --git a/packages/cli/src/util/logger.js b/packages/cli/src/util/logger.js index ce0d3b8788..693cc83e45 100644 --- a/packages/cli/src/util/logger.js +++ b/packages/cli/src/util/logger.js @@ -12,7 +12,6 @@ const consoleTransport = new (winston.transports.Console)({ humanReadableUnhandledException: true, level: 'info', showLevel: true, - format: winston.format.cli(), }); function useDebugConsole() { @@ -28,10 +27,6 @@ const dailyRotateFileTransport = new DailyRotateFile({ level: 'debug', maxFiles: 5, showLevel: true, - format: winston.format.combine( - winston.format.timestamp(), - winston.format.printf(info => `${info.timestamp} ${info.level} ${info.message}`), - ), }); // Reconfigure the default instance logger winston provides with DailyRotateFile for markbind-cli diff --git a/packages/core/package.json b/packages/core/package.json index fc5f5f2383..3ab7acfbd4 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -69,7 +69,7 @@ "vue-server-renderer": "2.6.14", "vue-template-compiler": "2.6.14", "walk-sync": "^2.0.2", - "winston": "^3.7.2" + "winston": "^2.4.4" }, "devDependencies": { "@types/bluebird": "^3.5.36", From 1c3c5db6b62152a99c5b661b28ff3740bc10488d Mon Sep 17 00:00:00 2001 From: tlylt Date: Sun, 1 May 2022 14:45:49 +0800 Subject: [PATCH 7/7] Wrap info --- packages/core/src/utils/logger.ts | 51 ++++++++++++++++--------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/packages/core/src/utils/logger.ts b/packages/core/src/utils/logger.ts index f1d2707479..1d3a0be65a 100644 --- a/packages/core/src/utils/logger.ts +++ b/packages/core/src/utils/logger.ts @@ -1,12 +1,10 @@ -const isError = require("lodash/isError"); -import winston from "winston"; +import winston from 'winston'; -let progressBar; +let progressBar: any; -const setProgressBar = (bar) => { +const setProgressBar = (bar: any) => { progressBar = bar; }; - const removeProgressBar = () => { progressBar = null; }; @@ -15,9 +13,8 @@ const consoleTransport = new winston.transports.Console({ colorize: true, handleExceptions: true, humanReadableUnhandledException: true, - level: "debug", + level: 'debug', showLevel: true, - format: winston.format.cli(), }); winston.configure({ @@ -25,18 +22,8 @@ winston.configure({ transports: [consoleTransport], }); -// patch inability to print stack trace -// https://github.com/winstonjs/winston/issues/1498#issuecomment-433680788 -winston.error = (err) => { - if (isError(err)) { - winston.log({ level: "error", message: `${err.stack || err}` }); - } else { - winston.log({ level: "error", message: err }); - } -}; - // create a wrapper for error messages -const errorWrap = (input) => { +const errorWrap = (input: any) => { if (progressBar) { progressBar.interruptBegin(); winston.error(input); @@ -47,7 +34,7 @@ const errorWrap = (input) => { }; // create a wrapper for warning messages -const warnWarp = (input) => { +const warnWarp = (input: any) => { if (progressBar) { progressBar.interruptBegin(); winston.warn(input); @@ -57,12 +44,26 @@ const warnWarp = (input) => { } }; -module.exports = { - error: errorWrap, - warn: warnWarp, - info: winston.info, - verbose: winston.verbose, - debug: winston.debug, +// create a wrapper for info messages +const infoWarp = (input: any) => { + if (progressBar) { + progressBar.interruptBegin(); + winston.info(input); + progressBar.interruptEnd(); + } else { + winston.info(input); + } +}; + +const { debug } = winston; +const { verbose } = winston; + +export { + errorWrap as error, + warnWarp as warn, + infoWarp as info, + verbose, + debug, setProgressBar, removeProgressBar, };