From d6d70865310d2e99361a472b594bc11f92e6929f Mon Sep 17 00:00:00 2001 From: Lam Wei Li Date: Tue, 26 Jul 2022 03:06:56 +0800 Subject: [PATCH 1/7] chore(deps-dev): downgraded prettier from 2.7.1 to 1.19.1 for Node.js 8.x compatibility --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3714ad2..6817ea1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5185,9 +5185,9 @@ } }, "prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true }, "proxyquire": { diff --git a/package.json b/package.json index 37d78fe..441f2b6 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "husky": "^8.0.1", "is-ci": "^3.0.1", "nyc": "^15.1.0", - "prettier": "^2.7.1", + "prettier": "^1.19.1", "proxyquire": "^2.1.3", "tap": "^16.3.0", "typescript": "^4.7.4" From 2dee68ddee07c3a65864ae67ed834f97b2d1c33d Mon Sep 17 00:00:00 2001 From: Lam Wei Li Date: Sun, 24 Jul 2022 00:44:14 +0800 Subject: [PATCH 2/7] style: forward-compatible prettier rules and cjs parser --- .prettierignore | 3 +-- package.json | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.prettierignore b/.prettierignore index 3ff683f..b6f4cc4 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,2 @@ +**/.* coverage -.github -.nyc_output diff --git a/package.json b/package.json index 441f2b6..1ba5b10 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,8 @@ }, "scripts": { "prepare": "is-ci || husky install", - "pretest": "prettier --check . && eslint \"lib/**/*.js\" \"test/**/*.js\"", - "prettier:fix": "prettier --write .", + "pretest": "prettier --check \"**/*.*\" && eslint \"lib/**/*.js\" \"test/**/*.js\"", + "prettier:fix": "prettier --write \"**/*.*\"", "test": "tap \"test/tap/**/*.js\" --cov --timeout=45", "typings": "tsc -p types/tsconfig.json" }, @@ -74,6 +74,16 @@ "browser": { "os": false }, + "prettier": { + "trailingComma": "es5", + "arrowParens": "always", + "overrides": [ + { + "files": ["*.cjs"], + "options": { "parser": "typescript" } + } + ] + }, "tap": { "check-coverage": true }, From 4bc5589a28217b0f0190a58bf10d251fc657ee1d Mon Sep 17 00:00:00 2001 From: Lam Wei Li Date: Mon, 25 Jul 2022 14:36:42 +0800 Subject: [PATCH 3/7] style: ran prettier --- docs/_layouts/default.html | 4 ++-- docs/connect-logger.md | 2 +- docs/layouts.md | 6 +++--- examples/custom-layout.js | 2 +- examples/hipchat-appender.js | 2 +- examples/patternLayout-tokens.js | 2 +- lib/appenders/dateFile.js | 4 ++-- lib/appenders/file.js | 8 ++++---- lib/appenders/multiprocess.js | 9 ++++----- lib/appenders/recording.js | 2 +- lib/appenders/tcp.js | 9 ++++----- lib/layouts.js | 7 +++---- lib/logger.js | 4 ++-- package.json | 8 ++++++-- test/tap/configuration-inheritance-test.js | 15 +++++++++------ test/tap/configuration-validation-test.js | 5 +++-- test/tap/connect-logger-test.js | 4 ++-- test/tap/connect-nolog-test.js | 4 ++-- test/tap/default-settings-test.js | 7 ++++--- test/tap/file-sighup-test.js | 5 +++-- test/tap/layouts-test.js | 7 ++++--- test/tap/logger-test.js | 2 +- test/tap/logging-test.js | 6 +++--- test/tap/multi-file-appender-test.js | 4 ++-- test/tap/tcp-appender-test.js | 2 +- types/test.ts | 2 +- 26 files changed, 70 insertions(+), 62 deletions(-) diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index ba8235b..b06aa7e 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -87,11 +87,11 @@ {% if site.google_analytics %}