diff --git a/package-lock.json b/package-lock.json index cb5a5610..4637fa8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,6 +27,7 @@ "aws-sdk": "2.999.0", "chai": "4.3.4", "chai-as-promised": "7.1.1", + "dayjs": "^1.11.6", "eslint": "7.32.0", "eslint-config-prettier": "8.3.0", "eslint-config-standard": "16.0.3", @@ -40,7 +41,6 @@ "husky": "7.0.2", "lint-staged": "11.2.0", "mocha": "9.1.2", - "moment": "2.29.1", "nyc": "15.1.0", "p-map": "4.0.0", "prettier": "2.4.1", @@ -1460,6 +1460,12 @@ "node": ">=0.10" } }, + "node_modules/dayjs": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz", + "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==", + "dev": true + }, "node_modules/debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -4545,15 +4551,6 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/moment": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", - "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", - "dev": true, - "engines": { - "node": "*" - } - }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -7739,9 +7736,9 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "color-string": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz", - "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", + "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", "requires": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -7906,6 +7903,12 @@ "assert-plus": "^1.0.0" } }, + "dayjs": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz", + "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==", + "dev": true + }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -10208,12 +10211,6 @@ } } }, - "moment": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", - "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", - "dev": true - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", diff --git a/package.json b/package.json index 01e1e4f8..a476362d 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,7 @@ "aws-sdk": "2.999.0", "chai": "4.3.4", "chai-as-promised": "7.1.1", + "dayjs": "^1.11.6", "eslint": "7.32.0", "eslint-config-prettier": "8.3.0", "eslint-config-standard": "16.0.3", @@ -74,7 +75,6 @@ "husky": "7.0.2", "lint-staged": "11.2.0", "mocha": "9.1.2", - "moment": "2.29.1", "nyc": "15.1.0", "p-map": "4.0.0", "prettier": "2.4.1", diff --git a/test/controllers/object.spec.js b/test/controllers/object.spec.js index a669e61e..ed37fd45 100644 --- a/test/controllers/object.spec.js +++ b/test/controllers/object.spec.js @@ -7,7 +7,7 @@ const FormData = require('form-data'); const fs = require('fs'); const http = require('http'); const { find, times } = require('lodash'); -const moment = require('moment'); +const dayjs = require('dayjs'); const pMap = require('p-map'); const request = require('request-promise-native').defaults({ resolveWithFullResponse: true, @@ -1140,7 +1140,7 @@ describe('Operations on Objects', () => { }) .promise(); expect(copyResult.ETag).to.equal(data.ETag); - expect(moment(copyResult.LastModified).isValid()).to.be.true; + expect(dayjs(copyResult.LastModified).isValid()).to.be.true; const object = await s3Client .getObject({ Bucket: 'bucket-b', @@ -1205,7 +1205,7 @@ describe('Operations on Objects', () => { }) .promise(); expect(copyResult.ETag).to.equal(data.ETag); - expect(moment(copyResult.LastModified).isValid()).to.be.true; + expect(dayjs(copyResult.LastModified).isValid()).to.be.true; }); it('copies an image object into another bucket and update its metadata', async function () { diff --git a/test/controllers/service.spec.js b/test/controllers/service.spec.js index 014551f3..560ad9fb 100644 --- a/test/controllers/service.spec.js +++ b/test/controllers/service.spec.js @@ -2,7 +2,7 @@ const { expect } = require('chai'); const { zip } = require('lodash'); -const moment = require('moment'); +const dayjs = require('dayjs'); const { createServerAndClient } = require('../helpers'); @@ -25,7 +25,7 @@ describe('Operations on the Service', () => { expect(data.Buckets).to.have.lengthOf(6); for (const [bucket, config] of zip(data.Buckets, buckets)) { expect(bucket.Name).to.equal(config.name); - expect(moment(bucket.CreationDate).isValid()).to.be.true; + expect(dayjs(bucket.CreationDate).isValid()).to.be.true; } }); }); diff --git a/test/middleware/vhost.spec.js b/test/middleware/vhost.spec.js index 3943021b..a1863e08 100644 --- a/test/middleware/vhost.spec.js +++ b/test/middleware/vhost.spec.js @@ -2,7 +2,7 @@ const { expect } = require('chai'); const { zip } = require('lodash'); -const moment = require('moment'); +const dayjs = require('dayjs'); const os = require('os'); const request = require('request-promise-native').defaults({ resolveWithFullResponse: true, @@ -48,7 +48,7 @@ describe('Virtual Host resolution', () => { expect(parsedBuckets).to.have.lengthOf(buckets.length); for (const [bucket, config] of zip(parsedBuckets, buckets)) { expect(bucket.Name).to.equal(config.name); - expect(moment(bucket.CreationDate).isValid()).to.be.true; + expect(dayjs(bucket.CreationDate).isValid()).to.be.true; } }); @@ -67,7 +67,7 @@ describe('Virtual Host resolution', () => { expect(parsedBuckets).to.have.lengthOf(buckets.length); for (const [bucket, config] of zip(parsedBuckets, buckets)) { expect(bucket.Name).to.equal(config.name); - expect(moment(bucket.CreationDate).isValid()).to.be.true; + expect(dayjs(bucket.CreationDate).isValid()).to.be.true; } }); @@ -85,7 +85,7 @@ describe('Virtual Host resolution', () => { expect(parsedBuckets).to.have.lengthOf(buckets.length); for (const [bucket, config] of zip(parsedBuckets, buckets)) { expect(bucket.Name).to.equal(config.name); - expect(moment(bucket.CreationDate).isValid()).to.be.true; + expect(dayjs(bucket.CreationDate).isValid()).to.be.true; } });