Replaces date.format.js in vendor with NPM package

4 files changed, 44 insertions, 46 deletions

diff --git a/app/assets/javascripts/boards/filters/due_date_filters.js b/app/assets/javascripts/boards/filters/due_date_filters.js
index 70132dbfa6f..9eaa0cd227d 100644
--- a/app/assets/javascripts/boards/filters/due_date_filters.js
+++ b/app/assets/javascripts/boards/filters/due_date_filters.js
@@ -1,8 +1,7 @@
-/* global dateFormat */
-
 import Vue from 'vue';
+import dateFormat from 'dateformat';
 
-Vue.filter('due-date', (value) => {
+Vue.filter('due-date', value => {
   const date = new Date(value);
   return dateFormat(date, 'mmm d, yyyy', true);
 });
diff --git a/app/assets/javascripts/due_date_select.js b/app/assets/javascripts/due_date_select.js
index 4164149dd06..17ea3bdb179 100644
--- a/app/assets/javascripts/due_date_select.js
+++ b/app/assets/javascripts/due_date_select.js
@@ -1,7 +1,6 @@
-/* global dateFormat */
-
 import $ from 'jquery';
 import Pikaday from 'pikaday';
+import dateFormat from 'dateformat';
 import { __ } from '~/locale';
 import axios from './lib/utils/axios_utils';
 import { timeFor } from './lib/utils/datetime_utility';
@@ -55,7 +54,7 @@ class DueDateSelect {
       format: 'yyyy-mm-dd',
       parse: dateString => parsePikadayDate(dateString),
       toString: date => pikadayToString(date),
-      onSelect: (dateText) => {
+      onSelect: dateText => {
         $dueDateInput.val(calendar.toString(dateText));
 
         if (this.$dropdown.hasClass('js-issue-boards-due-date')) {
@@ -73,7 +72,7 @@ class DueDateSelect {
   }
 
   initRemoveDueDate() {
-    this.$block.on('click', '.js-remove-due-date', (e) => {
+    this.$block.on('click', '.js-remove-due-date', e => {
       const calendar = this.$datePicker.data('pikaday');
       e.preventDefault();
 
@@ -124,7 +123,8 @@ class DueDateSelect {
       this.$loading.fadeOut();
     };
 
-    gl.issueBoards.BoardsStore.detail.issue.update(this.$dropdown.attr('data-issue-update'))
+    gl.issueBoards.BoardsStore.detail.issue
+      .update(this.$dropdown.attr('data-issue-update'))
       .then(fadeOutLoader)
       .catch(fadeOutLoader);
   }
@@ -147,17 +147,18 @@ class DueDateSelect {
 
     $('.js-remove-due-date-holder').toggleClass('hidden', selectedDateValue.length);
 
-    return axios.put(this.issueUpdateURL, this.datePayload)
-      .then(() => {
-        const tooltipText = hasDueDate ? `${__('Due date')}<br />${selectedDateValue} (${timeFor(selectedDateValue)})` : __('Due date');
-        if (isDropdown) {
-          this.$dropdown.trigger('loaded.gl.dropdown');
-          this.$dropdown.dropdown('toggle');
-        }
-        this.$sidebarCollapsedValue.attr('data-original-title', tooltipText);
+    return axios.put(this.issueUpdateURL, this.datePayload).then(() => {
+      const tooltipText = hasDueDate
+        ? `${__('Due date')}<br />${selectedDateValue} (${timeFor(selectedDateValue)})`
+        : __('Due date');
+      if (isDropdown) {
+        this.$dropdown.trigger('loaded.gl.dropdown');
+        this.$dropdown.dropdown('toggle');
+      }
+      this.$sidebarCollapsedValue.attr('data-original-title', tooltipText);
 
-        return this.$loading.fadeOut();
-      });
+      return this.$loading.fadeOut();
+    });
   }
 }
 
@@ -187,15 +188,19 @@ export default class DueDateSelectors {
       $datePicker.data('pikaday', calendar);
     });
 
-    $('.js-clear-due-date,.js-clear-start-date').on('click', (e) => {
+    $('.js-clear-due-date,.js-clear-start-date').on('click', e => {
       e.preventDefault();
-      const calendar = $(e.target).siblings('.datepicker').data('pikaday');
+      const calendar = $(e.target)
+        .siblings('.datepicker')
+        .data('pikaday');
       calendar.setDate(null);
     });
   }
   // eslint-disable-next-line class-methods-use-this
   initIssuableSelect() {
-    const $loading = $('.js-issuable-update .due_date').find('.block-loading').hide();
+    const $loading = $('.js-issuable-update .due_date')
+      .find('.block-loading')
+      .hide();
 
     $('.js-due-date-select').each((i, dropdown) => {
       const $dropdown = $(dropdown);
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
index 7cca32dc6fa..1f66fa811ea 100644
--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -1,11 +1,10 @@
 import $ from 'jquery';
 import timeago from 'timeago.js';
-import dateFormat from 'vendor/date.format';
+import dateFormat from 'dateformat';
 import { pluralize } from './text_utility';
 import { languageCode, s__ } from '../../locale';
 
 window.timeago = timeago;
-window.dateFormat = dateFormat;
 
 /**
  * Returns i18n month names array.
@@ -143,7 +142,8 @@ export const localTimeAgo = ($timeagoEls, setTimeago = true) => {
     if (setTimeago) {
       // Recreate with custom template
       $(el).tooltip({
-        template: '<div class="tooltip local-timeago" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',
+        template:
+          '<div class="tooltip local-timeago" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',
       });
     }
 
@@ -275,10 +275,8 @@ export const totalDaysInMonth = date => {
  *
  * @param {Array} quarter
  */
-export const totalDaysInQuarter = quarter => quarter.reduce(
-  (acc, month) => acc + totalDaysInMonth(month),
-  0,
-);
+export const totalDaysInQuarter = quarter =>
+  quarter.reduce((acc, month) => acc + totalDaysInMonth(month), 0);
 
 /**
  * Returns list of Dates referring to Sundays of the month
@@ -333,14 +331,8 @@ export const getTimeframeWindowFrom = (startDate, length) => {
   // Iterate and set date for the size of length
   // and push date reference to timeframe list
   const timeframe = new Array(length)
-                      .fill()
-                      .map(
-                        (val, i) => new Date(
-                          startDate.getFullYear(),
-                          startDate.getMonth() + i,
-                          1,
-                        ),
-                      );
+    .fill()
+    .map((val, i) => new Date(startDate.getFullYear(), startDate.getMonth() + i, 1));
 
   // Change date of last timeframe item to last date of the month
   timeframe[length - 1].setDate(totalDaysInMonth(timeframe[length - 1]));
@@ -362,14 +354,15 @@ export const getTimeframeWindowFrom = (startDate, length) => {
  * @param {Date} date
  * @param {Array} quarter
  */
-export const dayInQuarter = (date, quarter) => quarter.reduce((acc, month) => {
-  if (date.getMonth() > month.getMonth()) {
-    return acc + totalDaysInMonth(month);
-  } else if (date.getMonth() === month.getMonth()) {
-    return acc + date.getDate();
-  }
-  return acc + 0;
-}, 0);
+export const dayInQuarter = (date, quarter) =>
+  quarter.reduce((acc, month) => {
+    if (date.getMonth() > month.getMonth()) {
+      return acc + totalDaysInMonth(month);
+    } else if (date.getMonth() === month.getMonth()) {
+      return acc + date.getDate();
+    }
+    return acc + 0;
+  }, 0);
 
 window.gl = window.gl || {};
 window.gl.utils = {
diff --git a/app/assets/javascripts/pages/users/activity_calendar.js b/app/assets/javascripts/pages/users/activity_calendar.js
index 50d042fef29..9892a039941 100644
--- a/app/assets/javascripts/pages/users/activity_calendar.js
+++ b/app/assets/javascripts/pages/users/activity_calendar.js
@@ -2,6 +2,7 @@ import $ from 'jquery';
 import _ from 'underscore';
 import { scaleLinear, scaleThreshold } from 'd3-scale';
 import { select } from 'd3-selection';
+import dateFormat from 'dateformat';
 import { getDayName, getDayDifference } from '~/lib/utils/datetime_utility';
 import axios from '~/lib/utils/axios_utils';
 import flash from '~/flash';
@@ -26,7 +27,7 @@ function getSystemDate(systemUtcOffsetSeconds) {
 function formatTooltipText({ date, count }) {
   const dateObject = new Date(date);
   const dateDayName = getDayName(dateObject);
-  const dateText = dateObject.format('mmm d, yyyy');
+  const dateText = dateFormat(dateObject, 'mmm d, yyyy');
 
   let contribText = 'No contributions';
   if (count > 0) {
@@ -84,7 +85,7 @@ export default class ActivityCalendar {
       date.setDate(date.getDate() + i);
 
       const day = date.getDay();
-      const count = timestamps[date.format('yyyy-mm-dd')] || 0;
+      const count = timestamps[dateFormat(date, 'yyyy-mm-dd')] || 0;
 
       // Create a new group array if this is the first day of the week
       // or if is first object