Merge branch 'release/4.1.0'

Author: abhishekdev

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run pre-commit

.husky/pre-push

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run pre-push

.npmignore

@@ -9,6 +9,7 @@ dist/*.map
 .git*
 .dockerignore
 .travis.yml
+.husky
 babel.config.js
 prettier.config.js
 appveyor.yml

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12 as base
+FROM node:14 as base
 
 WORKDIR /project
 # Install app dependencies

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "build-revision",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Generate semver compatible version to uniquely identify project build using build metadata",
   "main": "index.js",
   "license": "MIT",
@@ -18,19 +18,15 @@
   "homepage": "https://github.com/abhishekdev/build-revision#readme",
   "scripts": {
     "build": "babel src -d dist --source-maps",
-    "prepare": "npm run build",
+    "prepare": "npm run build && husky install",
+    "pre-commit": "pretty-quick --staged && npm run lint",
+    "pre-push": "npm run build && npm test",
     "prepublishOnly": "npm run build && npm run test",
     "lint": "prettier --check \"src/**/*.js\" \"test/**/*.js\" index.js",
     "pretest": "npm run lint",
     "test": "nyc --reporter=html --reporter=text ava",
     "coverage": "nyc report --reporter=text-lcov | coveralls"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "pretty-quick --staged && npm run lint",
-      "pre-push": "npm run build && npm test"
-    }
-  },
   "ava": {
     "babel": true
   },
@@ -42,21 +38,21 @@
     "SHA"
   ],
   "dependencies": {
-    "moment": "^2.28.0",
+    "dayjs": "^1.10.4",
     "read-pkg-up": "^7.0.1",
-    "semver": "^7.3.2",
+    "semver": "^7.3.5",
     "username": "^5.1.0"
   },
   "devDependencies": {
     "@ava/babel": "^1.0.1",
-    "@babel/cli": "^7.11.6",
-    "@babel/core": "^7.11.6",
-    "@babel/preset-env": "^7.11.5",
-    "ava": "^3.12.1",
+    "@babel/cli": "^7.13.14",
+    "@babel/core": "^7.13.15",
+    "@babel/preset-env": "^7.13.15",
+    "ava": "^3.15.0",
     "coveralls": "^3.1.0",
-    "husky": "^4.3.0",
+    "husky": "^6.0.0",
     "nyc": "^15.1.0",
-    "prettier": "^2.1.2",
-    "pretty-quick": "^3.0.2"
+    "prettier": "^2.2.1",
+    "pretty-quick": "^3.1.0"
   }
 }

package.json

@@ -1,7 +1,7 @@
 'use strict';
 
 import path from 'path';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import semver from 'semver';
 import username from 'username';
 import readPkgUp from 'read-pkg-up';
@@ -20,7 +20,7 @@ const semverString = (str) => {
 // e.g. 2017-Jan-01, 15:00:01.100 => "20170130T1500Z"
 const semverMoment = () => {
     // Get ISO date after ignoring the millisecond precision
-    const isoDate = moment().milliseconds(0).toISOString();
+    const isoDate = dayjs().millisecond(0).toISOString();
 
     // Replace millisecond information as the 'dot' notation for it is incompatible with semver
     return semverString(isoDate.replace(REGEX_ISODATE_MILLISECONDS, ''));

src/version.js

@@ -1,10 +1,18 @@
 import fs from 'fs';
 import test from 'ava';
 import semver from 'semver';
-import moment from 'moment';
+import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
 
 import buildRevision from '../index';
 
+dayjs.extend(utc);
+dayjs.extend(customParseFormat);
+
+// Expect ISO 8601 compatible format which has no separators for semver compatibility
+const TIMESTAMP_FORMAT = 'YYYYMMDD[T]HHmmss[Z]';
+
 test('build revision is semver compatible', async (t) => {
     const option = { cwd: 'test/fixture/package-valid/target' };
 
@@ -69,7 +77,10 @@ test('generates ISO 8601 UTC timestamp for dirty builds', async (t) => {
 
     const revision = await buildRevision(option);
     const timestamp = revision.split('.').pop();
-    t.true(moment(timestamp).isValid(), 'could not parse a valid timestamp');
+    t.true(
+        dayjs.utc(timestamp, TIMESTAMP_FORMAT).isValid(),
+        'could not parse a valid timestamp'
+    );
 
     // Test Teardown: Reset repository
     fs.unlink('test/fixture/package-valid/change.txt', (err) => {
@@ -97,7 +108,10 @@ test.serial('works when package is not a git repo', async (t) => {
         semver.valid(revision) && revision.includes(`+${PREFIX}`),
         'could not parse default buildinfo prefix for un-versioned repo'
     );
-    t.true(moment(timestamp).isValid(), 'could not parse a valid timestamp');
+    t.true(
+        dayjs.utc(timestamp, TIMESTAMP_FORMAT).isValid(),
+        'could not parse a valid timestamp'
+    );
 
     // Test Teardown: Re-instate .git directory
     if (fs.existsSync('backup.git')) {