From 12a48c5598d67f67bc09ceac393176200bf65865 Mon Sep 17 00:00:00 2001 From: Douglas Christopher Wilson Date: Fri, 21 Dec 2018 23:40:01 -0400 Subject: [PATCH 1/3] build: eslint@5.10.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7775fe66..86aa0f1b 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "on-headers": "~1.0.1" }, "devDependencies": { - "eslint": "5.9.0", + "eslint": "5.10.0", "eslint-config-standard": "12.0.0", "eslint-plugin-import": "2.14.0", "eslint-plugin-markdown": "1.0.0-rc.0", From 59e2fc7a43856d407eee6c05ed4edae85d951339 Mon Sep 17 00:00:00 2001 From: Matt Browne Date: Fri, 19 Jul 2019 11:07:12 -0400 Subject: [PATCH 2/3] refactored deprecation message for `default` format to fix issue when using `esm` module. see https://github.com/expressjs/morgan/issues/190 --- HISTORY.md | 1 + index.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index ac31c736..9beda147 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -7,6 +7,7 @@ unreleased * deps: depd@~2.0.0 - Replace internal `eval` usage with `Function` constructor - Use instance methods on `process` to check for listeners + * refactored deprecation message for `default` format to fix issue when using `esm` module 1.9.1 / 2018-09-10 ================== diff --git a/index.js b/index.js index 4680eaec..f45c2a04 100644 --- a/index.js +++ b/index.js @@ -161,8 +161,8 @@ morgan.format('common', ':remote-addr - :remote-user [:date[clf]] ":method :url * Default format. */ +// @deprecated morgan.format('default', ':remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"') -deprecate.property(morgan, 'default', 'default format: use combined format') /** * Short format. @@ -448,6 +448,10 @@ function getFormatFunction (name) { // lookup format var fmt = morgan[name] || name || morgan.default + if (fmt === morgan.default) { + deprecate('default format: use combined format') + } + // return compiled format return typeof fmt !== 'function' ? compile(fmt) From eb8d1efdd0d9110fdad4f07eecc9582dccdea750 Mon Sep 17 00:00:00 2001 From: Matt Browne Date: Fri, 19 Jul 2019 11:25:39 -0400 Subject: [PATCH 3/3] changed to compare format name instead of format string --- index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index f45c2a04..10269cc3 100644 --- a/index.js +++ b/index.js @@ -445,13 +445,13 @@ function format (name, fmt) { */ function getFormatFunction (name) { - // lookup format - var fmt = morgan[name] || name || morgan.default - - if (fmt === morgan.default) { + if (name === 'default') { deprecate('default format: use combined format') } + // lookup format + var fmt = morgan[name] || name || morgan.default + // return compiled format return typeof fmt !== 'function' ? compile(fmt)