Skip to content

Commit b5e4a43

Browse files
authored
Merge pull request #39 from kpfefferle/moment-to-luxon
2 parents 8b529f6 + b8ec7d8 commit b5e4a43

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

lib/legacy-table.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
let moment = require('moment');
1+
let { DateTime } = require('luxon');
22
let CoreObject = require('core-object');
33

44
module.exports = CoreObject.extend({
@@ -38,7 +38,7 @@ module.exports = CoreObject.extend({
3838
let value = revision[key.name] ? revision[key.name] : "";
3939

4040
if(key.name === 'timestamp') {
41-
value = moment(value).format("YYYY/MM/DD HH:mm:ss");
41+
value = DateTime.fromMillis(value).toFormat("yyyy/MM/dd HH:mm:ss");
4242
}
4343

4444
if(key.maxLength !== -1) {

lib/scm-table.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const Table = require('cli-table3');
2-
const moment = require('moment');
2+
const { DateTime } = require('luxon');
33
const CoreObject = require('core-object');
44
const RSVP = require('rsvp');
55

@@ -70,7 +70,7 @@ module.exports = CoreObject.extend({
7070
];
7171

7272
if (this._isWide()) {
73-
let value = moment(data.timestamp).format("YYYY/MM/DD HH:mm:ss");
73+
let value = DateTime.fromMillis(data.timestamp).toFormat('yyyy/MM/dd HH:mm:ss');
7474
row.push(value);
7575
}
7676

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"cli-table3": "^0.6.0",
2222
"core-object": "^3.1.5",
2323
"ember-cli-deploy-plugin": "^0.2.3",
24-
"moment": "^2.25.3",
24+
"luxon": "^1.25.0",
2525
"rsvp": "^4.8.5"
2626
},
2727
"devDependencies": {

tests/index-test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
const moment = require('moment');
3+
const { DateTime } = require('luxon');
44
const chai = require('chai');
55
const chaiAsPromised = require("chai-as-promised");
66
chai.use(chaiAsPromised);
@@ -198,10 +198,10 @@ describe('displayRevisions plugin', function() {
198198
assert.equal(messages.length, 0);
199199
});
200200

201-
it('transforms timestamps to human-readable dates (YYYY/MM/DD HH:mm:ss)', function() {
201+
it('transforms timestamps to human-readable dates (yyyy/MM/dd HH:mm:ss)', function() {
202202
plugin.displayRevisions(context);
203-
let expectedFormat = ('YYYY/MM/DD HH:mm:ss');
204-
let expectedDate = moment(1438232435000).format(expectedFormat);
203+
let expectedFormat = ('yyyy/MM/dd HH:mm:ss');
204+
let expectedDate = DateTime.fromMillis(1438232435000).toFormat(expectedFormat);
205205

206206
let messages = mockUi.messages.reduce(function(previous, current) {
207207
if (current.indexOf(expectedDate) !== -1) {

yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -4725,6 +4725,11 @@ lru-cache@^5.1.1:
47254725
dependencies:
47264726
yallist "^3.0.2"
47274727

4728+
luxon@^1.25.0:
4729+
version "1.25.0"
4730+
resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.25.0.tgz#d86219e90bc0102c0eb299d65b2f5e95efe1fe72"
4731+
integrity sha512-hEgLurSH8kQRjY6i4YLey+mcKVAWXbDNlZRmM6AgWDJ1cY3atl8Ztf5wEY7VBReFbmGnwQPz7KYJblL8B2k0jQ==
4732+
47284733
macos-release@^2.2.0:
47294734
version "2.3.0"
47304735
resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f"
@@ -5113,11 +5118,6 @@ mocha@^7.1.2:
51135118
yargs-parser "13.1.2"
51145119
yargs-unparser "1.6.0"
51155120

5116-
moment@^2.25.3:
5117-
version "2.25.3"
5118-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.25.3.tgz#252ff41319cf41e47761a1a88cab30edfe9808c0"
5119-
integrity sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==
5120-
51215121
morgan@^1.9.1:
51225122
version "1.10.0"
51235123
resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"

0 commit comments

Comments
 (0)