Skip to content

Commit 4b7bdd9

Browse files
committed
Upgrade date-fns to v2
- new camel cased imports - unicode date formatter codes - renamed parse to parseISO
1 parent fbf9b86 commit 4b7bdd9

File tree

9 files changed

+26
-18
lines changed

9 files changed

+26
-18
lines changed

client/modules/IDE/selectors/collections.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createSelector } from 'reselect';
2-
import differenceInMilliseconds from 'date-fns/difference_in_milliseconds';
2+
import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
33
import find from 'lodash/find';
44
import orderBy from 'lodash/orderBy';
55
import { DIRECTION } from '../actions/sorting';

client/modules/IDE/selectors/projects.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createSelector } from 'reselect';
2-
import differenceInMilliseconds from 'date-fns/difference_in_milliseconds';
2+
import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
33
import orderBy from 'lodash/orderBy';
44
import { DIRECTION } from '../actions/sorting';
55

client/utils/formatDate.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
2-
import differenceInMilliseconds from 'date-fns/difference_in_milliseconds';
1+
import formatDistanceToNow from 'date-fns/formatDistanceToNow';
2+
import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
33
import format from 'date-fns/format';
4-
import isValid from 'date-fns/is_valid';
5-
import parseISO from 'date-fns/parse';
4+
import isValid from 'date-fns/isValid';
5+
import parseISO from 'date-fns/parseISO';
66
import i18next from 'i18next';
77

88
function parse(maybeDate) {
@@ -33,8 +33,8 @@ export default {
3333
return i18next.t('formatDate.35Seconds');
3434
}
3535

36-
const timeAgo = distanceInWordsToNow(parsed, {
37-
includeSeconds: true
36+
const timeAgo = formatDistanceToNow(parsed, {
37+
includeSeconds: false
3838
});
3939
return i18next.t('formatDate.Ago', { timeAgo });
4040
}
@@ -43,7 +43,7 @@ export default {
4343
},
4444
format(date, { showTime = true } = {}) {
4545
const parsed = parse(date);
46-
const formatType = showTime ? 'MMM D, YYYY h:mm A' : 'MMM D, YYYY';
46+
const formatType = showTime ? 'PPpp' : 'PP';
4747

4848
if (parsed) {
4949
return format(parsed, formatType);

package-lock.json

Lines changed: 11 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
"cors": "^2.8.5",
159159
"cross-env": "^5.2.1",
160160
"csslint": "^1.0.5",
161-
"date-fns": "^1.30.1",
161+
"date-fns": "^2.16.1",
162162
"decomment": "^0.8.7",
163163
"dotenv": "^2.0.0",
164164
"dropzone": "^4.3.0",

server/controllers/file.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import each from 'async/each';
22
import mime from 'mime-types';
3-
import isBefore from 'date-fns/is_before';
3+
import isBefore from 'date-fns/isBefore';
44
import Project from '../models/project';
55
import { resolvePathToFile } from '../utils/filePath';
66
import { deleteObjectsFromS3, getObjectKey } from './aws.controller';

server/controllers/project.controller.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import archiver from 'archiver';
22
import format from 'date-fns/format';
33
import isUrl from 'is-url';
44
import jsdom, { serializeDocument } from 'jsdom';
5-
import isAfter from 'date-fns/is_after';
5+
import isAfter from 'date-fns/isAfter';
66
import request from 'request';
77
import slugify from 'slugify';
88
import Project from '../models/project';
@@ -215,7 +215,7 @@ function buildZip(project, req, res) {
215215
res.status(500).send({ error: err.message });
216216
});
217217

218-
const currentTime = format(new Date(), 'YYYY_MM_DD_HH_mm_ss');
218+
const currentTime = format(new Date(), 'yyyy_MM_dd_HH_mm_ss');
219219
project.slug = slugify(project.name, '_');
220220
res.attachment(`${generateFileSystemSafeName(project.slug)}_${currentTime}.zip`);
221221
zip.pipe(res);

server/controllers/project.controller/deleteProject.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import isBefore from 'date-fns/is_before';
1+
import isBefore from 'date-fns/isBefore';
22
import Project from '../../models/project';
33
import { deleteObjectsFromS3, getObjectKey } from '../aws.controller';
44
import createApplicationErrorClass from '../../utils/createApplicationErrorClass';

server/models/__test__/project.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import mockingoose from 'mockingoose';
2-
import differenceInSeconds from 'date-fns/difference_in_seconds';
2+
import differenceInSeconds from 'date-fns/differenceInSeconds';
33

44
import Project from '../project';
55

0 commit comments

Comments
 (0)