Move from moment to native Date object backed with date-fns

package.json

@@ -51,7 +51,6 @@
     "@types/jsdom": "^16.2.11",
     "@types/jsonwebtoken": "^8.5.1",
     "@types/lodash": "^4.14.170",
-    "@types/moment": "^2.13.0",
     "@types/node-jose": "^1.1.6",
     "@types/passport": "^1.0.6",
     "@types/passport-oauth2": "^1.4.10",
@@ -124,6 +123,7 @@
     "d3-scale": "^3.3.0",
     "d3-selection": "^2.0.0",
     "d3-shape": "^2.1.0",
+    "date-fns": "^2.22.1",
     "express": "^4.17.1",
     "express-pino-logger": "^6.0.0",
     "express-static-gzip": "^2.1.1",
@@ -133,7 +133,6 @@
     "helmet": "^4.6.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
-    "moment": "^2.29.1",
     "nanoid": "^3.1.23",
     "node-jose": "^2.0.0",
     "node-zendesk": "^2.1.0",

src/components/app/app.test.ts

@@ -4,8 +4,8 @@
 // Mocking request-promise-native is a workaround. See https://github.com/request/request-promise/issues/247.
 jest.mock('request-promise-native');
 
+import { endOfMonth, format, startOfMonth } from 'date-fns';
 import jwt from 'jsonwebtoken';
-import moment from 'moment';
 import nock from 'nock';
 import request, { SuperTest, Test } from 'supertest';
 
@@ -19,10 +19,10 @@ import Router, { IParameters } from '../../lib/router';
 import { CLOUD_CONTROLLER_ADMIN } from '../auth';
 
 import init from './app';
-import csp from './app.csp';
+import { csp } from './app.csp';
 import { config } from './app.test.config';
 import { IContext, initContext } from './context';
-import router from './router';
+import { router } from './router';
 
 const tokenKey = 'tokensecret';
 
@@ -126,12 +126,8 @@ describe('app test suite', () => {
   });
 
   it('should be able to handle 500 error when accessing pricing calculator', async () => {
-    const rangeStart = moment()
-      .startOf('month')
-      .format('YYYY-MM-DD');
-    const rangeStop = moment()
-      .endOf('month')
-      .format('YYYY-MM-DD');
+    const rangeStart = format(startOfMonth(new Date()), 'yyyy-MM-dd');
+    const rangeStop = format(endOfMonth(new Date()), 'yyyy-MM-dd');
 
     nockBilling
       .get(`/pricing_plans?range_start=${rangeStart}&range_stop=${rangeStop}`)
@@ -208,7 +204,7 @@ describe('app test suite', () => {
   });
 
   it('should be able to access marketplace without login', async () => {
-    const service = { guid: 'SERVICE_GUID', name: 'postgres', broker_catalog: { metadata: {} }, tags: [] };
+    const service = { broker_catalog: { metadata: {} }, guid: 'SERVICE_GUID', name: 'postgres', tags: [] };
     nockCF
       .get('/v3/service_offerings').reply(200, { pagination: { next: null }, resources: [ service ] });
 
@@ -229,8 +225,8 @@ describe('app test suite', () => {
   });
 
   it('should be able to access marketplace service without login', async () => {
-    const service = { guid: 'SERVICE_GUID', name: 'postgres', broker_catalog: { metadata: {} }, tags: [] };
-    const plan = { name: 'tiny', broker_catalog: { metadata: {} } };
+    const service = { broker_catalog: { metadata: {} }, guid: 'SERVICE_GUID', name: 'postgres', tags: [] };
+    const plan = { broker_catalog: { metadata: {} }, name: 'tiny' };
     nockCF
       .get('/v3/service_offerings/SERVICE_GUID')
       .reply(200, service)

src/components/application-events/controllers.test.tsx

@@ -1,12 +1,12 @@
+import { format } from 'date-fns';
 import lodash from 'lodash';
-import moment from 'moment';
 import nock from 'nock';
 
 import { DATE_TIME } from '../../layouts';
 import { spacesMissingAroundInlineElements } from '../../layouts/react-spacing.test';
 import * as data from '../../lib/cf/cf.test.data';
 import { app as defaultApp } from '../../lib/cf/test-data/app';
-import { auditEvent as defaultAuditEvent, auditEventForAutoscaler } from '../../lib/cf/test-data/audit-event';
+import { auditEventForAutoscaler, auditEvent as defaultAuditEvent } from '../../lib/cf/test-data/audit-event';
 import { org as defaultOrg } from '../../lib/cf/test-data/org';
 import { wrapV3Resources } from '../../lib/cf/test-data/wrap-resources';
 import { createTestContext } from '../app/app.test-helpers';
@@ -40,7 +40,7 @@ describe('application event', () => {
   afterEach(() => {
     nockAccounts.done();
     nockCF.on('response', () => {
-  nockCF.done()
+    nockCF.done();
 });
 
     nock.cleanAll();
@@ -54,18 +54,18 @@ describe('application event', () => {
     const event = defaultAuditEvent();
 
     const response = await viewApplicationEvent(ctx, {
-      organizationGUID: '6e1ca5aa-55f1-4110-a97f-1f3473e771b9',
-      spaceGUID: '38511660-89d9-4a6e-a889-c32c7e94f139',
       applicationGUID: defaultApp().metadata.guid,
       eventGUID: event.guid,
+      organizationGUID: '6e1ca5aa-55f1-4110-a97f-1f3473e771b9',
+      spaceGUID: '38511660-89d9-4a6e-a889-c32c7e94f139',
     });
 
     expect(response.body).toContain(
       `Application ${defaultApp().entity.name} Event details`,
     );
 
     expect(response.body).toContain(
-      /* DateTime    */ moment(event.updated_at).format(DATE_TIME),
+      /* DateTime    */ format(new Date(event.updated_at), DATE_TIME),
     );
     expect(response.body).toContain(/* Actor       */ 'admin');
     expect(response.body).toContain(/* Description */ 'Updated application');
@@ -99,7 +99,7 @@ describe('application event', () => {
     );
 
     expect(response.body).toContain(
-      /* DateTime    */ moment(event.updated_at).format(DATE_TIME),
+      /* DateTime    */ format(new Date(event.updated_at), DATE_TIME),
     );
     expect(response.body).toContain(/* Actor       */ 'one@user.in.database');
     expect(response.body).toContain(/* Description */ 'Updated application');
@@ -129,7 +129,7 @@ describe('application event', () => {
     );
 
     expect(response.body).toContain(
-      /* DateTime    */ moment(event.updated_at).format(DATE_TIME),
+      /* DateTime    */ format(new Date(event.updated_at), DATE_TIME),
     );
     expect(response.body).toContain(/* Actor       */ 'unknown-actor');
     expect(response.body).toContain(/* Description */ 'Updated application');

src/components/calculator/controllers.test.tsx

@@ -1,4 +1,4 @@
-import moment from 'moment';
+import { endOfMonth, format, startOfMonth } from 'date-fns';
 import nock from 'nock';
 
 import { spacesMissingAroundInlineElements } from '../../layouts/react-spacing.test';
@@ -36,12 +36,8 @@ describe('calculator test suite', () => {
   });
 
   it('should get calculator', async () => {
-    const rangeStart = moment()
-      .startOf('month')
-      .format('YYYY-MM-DD');
-    const rangeStop = moment()
-      .endOf('month')
-      .format('YYYY-MM-DD');
+    const rangeStart = format(startOfMonth(new Date()), 'yyyy-MM-dd');
+    const rangeStop = format(endOfMonth(new Date()), 'yyyy-MM-dd');
 
     nock(config.billingAPI)
       .get(`/pricing_plans?range_start=${rangeStart}&range_stop=${rangeStop}`)
@@ -107,12 +103,8 @@ describe('calculator test suite', () => {
   });
 
   it('should get a zero quote if no items are specified', async () => {
-    const rangeStart = moment()
-      .startOf('month')
-      .format('YYYY-MM-DD');
-    const rangeStop = moment()
-      .endOf('month')
-      .format('YYYY-MM-DD');
+    const rangeStart = format(startOfMonth(new Date()), 'yyyy-MM-dd');
+    const rangeStop = format(endOfMonth(new Date()), 'yyyy-MM-dd');
 
     nock(config.billingAPI)
       .get(`/pricing_plans?range_start=${rangeStart}&range_stop=${rangeStop}`)
@@ -130,12 +122,8 @@ describe('calculator test suite', () => {
   });
 
   it('should calculate prices (including exchange rate) when provided fake services', async () => {
-    const rangeStart = moment()
-      .startOf('month')
-      .format('YYYY-MM-DD');
-    const rangeStop = moment()
-      .endOf('month')
-      .format('YYYY-MM-DD');
+    const rangeStart = format(startOfMonth(new Date()), 'yyyy-MM-dd');
+    const rangeStop = format(endOfMonth(new Date()), 'yyyy-MM-dd');
 
     nock(config.billingAPI)
       .get(`/pricing_plans?range_start=${rangeStart}&range_stop=${rangeStop}`)
@@ -209,12 +197,8 @@ describe('calculator test suite', () => {
   });
 
   it('should sort the quote by order added', async () => {
-    const rangeStart = moment()
-      .startOf('month')
-      .format('YYYY-MM-DD');
-    const rangeStop = moment()
-      .endOf('month')
-      .format('YYYY-MM-DD');
+    const rangeStart = format(startOfMonth(new Date()), 'yyyy-MM-dd');
+    const rangeStop = format(endOfMonth(new Date()), 'yyyy-MM-dd');
 
     const postgresGuid = 'f4d4b95a-f55e-4593-8d54-3364c25798c4';
     const appGuid = 'f4d4b95b-f55e-4593-8d54-3364c25798c0';
@@ -267,12 +251,8 @@ describe('calculator test suite', () => {
   });
 
   it('should filter out compose plans', async () => {
-    const rangeStart = moment()
-      .startOf('month')
-      .format('YYYY-MM-DD');
-    const rangeStop = moment()
-      .endOf('month')
-      .format('YYYY-MM-DD');
+    const rangeStart = format(startOfMonth(new Date()), 'yyyy-MM-dd');
+    const rangeStop = format(endOfMonth(new Date()), 'yyyy-MM-dd');
 
     nock(config.billingAPI)
       .get(`/pricing_plans?range_start=${rangeStart}&range_stop=${rangeStop}`)
@@ -295,12 +275,8 @@ describe('calculator test suite', () => {
   });
 
   it('should show postgres plan and sort the versions', async () => {
-    const rangeStart = moment()
-      .startOf('month')
-      .format('YYYY-MM-DD');
-    const rangeStop = moment()
-      .endOf('month')
-      .format('YYYY-MM-DD');
+    const rangeStart = format(startOfMonth(new Date()), 'yyyy-MM-dd');
+    const rangeStop = format(endOfMonth(new Date()), 'yyyy-MM-dd');
 
     nock(config.billingAPI)
       .get(`/pricing_plans?range_start=${rangeStart}&range_stop=${rangeStop}`)
@@ -357,12 +333,8 @@ describe('calculator test suite', () => {
   });
 
   it('should use calculator and ignore empty application', async () => {
-    const rangeStart = moment()
-      .startOf('month')
-      .format('YYYY-MM-DD');
-    const rangeStop = moment()
-      .endOf('month')
-      .format('YYYY-MM-DD');
+    const rangeStart = format(startOfMonth(new Date()), 'yyyy-MM-dd');
+    const rangeStop = format(endOfMonth(new Date()), 'yyyy-MM-dd');
 
     nock(config.billingAPI)
       .get(`/pricing_plans?range_start=${rangeStart}&range_stop=${rangeStop}`)
@@ -419,12 +391,8 @@ describe('calculator test suite', () => {
   });
 
   it('should omit printing "default" when there is only a default pricing plan', async () => {
-    const rangeStart = moment()
-      .startOf('month')
-      .format('YYYY-MM-DD');
-    const rangeStop = moment()
-      .endOf('month')
-      .format('YYYY-MM-DD');
+    const rangeStart = format(startOfMonth(new Date()), 'yyyy-MM-dd');
+    const rangeStop = format(endOfMonth(new Date()), 'yyyy-MM-dd');
 
     nock(config.billingAPI)
       .get(`/pricing_plans?range_start=${rangeStart}&range_stop=${rangeStop}`)