diff --git a/lib/complexValues/date.js b/lib/complexValues/date.js index 5a28c21..b437456 100644 --- a/lib/complexValues/date.js +++ b/lib/complexValues/date.js @@ -1,6 +1,6 @@ 'use strict' -const moment = require('moment') +const dateTime = require('date-time') const constants = require('../constants') const formatUtils = require('../formatUtils') @@ -28,9 +28,12 @@ exports.tag = tag function formatDate (date) { // Always format in UTC. The local timezone shouldn't be used since it's most // likely different from that of CI servers. - const utc = moment.utc(date) - const ms = utc.milliseconds() - return utc.format(`YYYY-MM-DD HH:mm:ss [${ms > 0 ? `${ms}ms Z` : 'Z'}]`) + return dateTime({ + date, + local: false, + showTimeZone: true, + showMilliseconds: true + }) } class DateValue extends object.ObjectValue { diff --git a/package-lock.json b/package-lock.json index 618d332..297ba0a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1007,10 +1007,9 @@ } }, "date-time": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz", - "integrity": "sha1-7S9tk9l5DOL9ZtW1/z7dW7y/Owc=", - "dev": true + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz", + "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==" }, "debug": { "version": "2.6.8", @@ -3069,7 +3068,8 @@ "moment": { "version": "2.18.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", - "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=" + "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=", + "dev": true }, "ms": { "version": "2.0.0", @@ -5086,6 +5086,11 @@ } } }, + "time-zone": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz", + "integrity": "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0=" + }, "timed-out": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", diff --git a/package.json b/package.json index 4f318bb..dd43c3b 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ }, "homepage": "https://github.com/concordancejs/concordance#readme", "dependencies": { + "date-time": "^2.1.0", "esutils": "^2.0.2", "fast-diff": "^1.1.1", "function-name-support": "^0.2.0", @@ -35,7 +36,6 @@ "lodash.flattendeep": "^4.4.0", "lodash.merge": "^4.6.0", "md5-hex": "^2.0.0", - "moment": "^2.18.1", "semver": "^5.3.0", "well-known-symbols": "^1.0.0" }, diff --git a/test/snapshots/diff.js.md b/test/snapshots/diff.js.md index 6d716eb..468c29f 100644 --- a/test/snapshots/diff.js.md +++ b/test/snapshots/diff.js.md @@ -432,8 +432,8 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `%diffGutters.actual#- %%object.ctor.open%Date%object.ctor.close% %date.value.open%1969-07-20 20:17:40 Z%date.value.close% %object.openBracket#{%%object.closeBracket#}%␊ - %diffGutters.expected#+ %%object.ctor.open%Date%object.ctor.close% %date.value.open%1969-07-21 20:17:40 Z%date.value.close% %object.openBracket#{%␊ + `%diffGutters.actual#- %%object.ctor.open%Date%object.ctor.close% %date.value.open%1969-07-20 20:17:40 UTC%date.value.close% %object.openBracket#{%%object.closeBracket#}%␊ + %diffGutters.expected#+ %%object.ctor.open%Date%object.ctor.close% %date.value.open%1969-07-21 20:17:40 UTC%date.value.close% %object.openBracket#{%␊ %diffGutters.expected#+ % foo%property.separator#: %%string.line.open#'%%string.open%bar%string.close%%string.line.close#'%%property.after#,%␊ %diffGutters.expected#+ %%object.closeBracket#}%` diff --git a/test/snapshots/diff.js.snap b/test/snapshots/diff.js.snap index dc33f51..cb57f1e 100644 Binary files a/test/snapshots/diff.js.snap and b/test/snapshots/diff.js.snap differ diff --git a/test/snapshots/format.js.md b/test/snapshots/format.js.md index b1b53f0..08b2c76 100644 --- a/test/snapshots/format.js.md +++ b/test/snapshots/format.js.md @@ -463,7 +463,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - '%object.ctor.open%Date%object.ctor.close% %date.value.open%1969-07-20 20:17:40 12ms Z%date.value.close% %object.openBracket#{%%object.closeBracket#}%' + '%object.ctor.open%Date%object.ctor.close% %date.value.open%1969-07-20 20:17:40 12ms UTC%date.value.close% %object.openBracket#{%%object.closeBracket#}%' > Snapshot 2 @@ -473,7 +473,7 @@ Generated by [AVA](https://ava.li). > Snapshot 1 - `%object.ctor.open%Date%object.ctor.close% %date.value.open%1969-07-20 20:17:40 Z%date.value.close% %object.openBracket#{%␊ + `%object.ctor.open%Date%object.ctor.close% %date.value.open%1969-07-20 20:17:40 UTC%date.value.close% %object.openBracket#{%␊ foo%property.separator#: %%string.line.open#'%%string.open%bar%string.close%%string.line.close#'%%property.after#,%␊ %object.closeBracket#}%` @@ -813,7 +813,7 @@ Generated by [AVA](https://ava.li). > Snapshot 3 - '%object.ctor.open%Baz%object.ctor.close% %object.secondaryStringTag.open#@%Date%object.secondaryStringTag.close% %date.value.open%1969-07-20 20:17:40 Z%date.value.close% %object.openBracket#{%%object.closeBracket#}%' + '%object.ctor.open%Baz%object.ctor.close% %object.secondaryStringTag.open#@%Date%object.secondaryStringTag.close% %date.value.open%1969-07-20 20:17:40 UTC%date.value.close% %object.openBracket#{%%object.closeBracket#}%' > Snapshot 4 diff --git a/test/snapshots/format.js.snap b/test/snapshots/format.js.snap index 0e51e37..4bf0479 100644 Binary files a/test/snapshots/format.js.snap and b/test/snapshots/format.js.snap differ diff --git a/test/snapshots/max-depth.js.md b/test/snapshots/max-depth.js.md index 394ad93..b9611a0 100644 --- a/test/snapshots/max-depth.js.md +++ b/test/snapshots/max-depth.js.md @@ -22,8 +22,8 @@ Generated by [AVA](https://ava.li). two: {␊ arr: [],␊ arr2: Array [ … ],␊ - date: Date 1969-07-20 20:17:40 Z {},␊ - date2: Date 1969-07-20 20:17:40 Z { … },␊ + date: Date 1969-07-20 20:17:40 UTC {},␊ + date2: Date 1969-07-20 20:17:40 UTC { … },␊ error: Error { … },␊ fn: Function fn {},␊ fn2: Function { … },␊ @@ -71,8 +71,8 @@ Generated by [AVA](https://ava.li). two: {␊ arr: [],␊ arr2: Array [ … ],␊ - date: Date 1969-07-20 20:17:40 Z {},␊ - date2: Date 1969-07-20 20:17:40 Z { … },␊ + date: Date 1969-07-20 20:17:40 UTC {},␊ + date2: Date 1969-07-20 20:17:40 UTC { … },␊ error: Error { … },␊ fn: Function fn {},␊ fn2: Function { … },␊ diff --git a/test/snapshots/max-depth.js.snap b/test/snapshots/max-depth.js.snap index e21328f..3dbd962 100644 Binary files a/test/snapshots/max-depth.js.snap and b/test/snapshots/max-depth.js.snap differ