refactored deprecation message for default format to fix issue when…

… using `esm` module. see expressjs#190
mbrowne · Jul 19, 2019 · 59e2fc7 · 59e2fc7
1 parent 12a48c5
commit 59e2fc7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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)