Merge pull request #6972 from w33ble/npm-datemath

Use @elastic/datemath module from npm

package.json

@@ -67,6 +67,7 @@
   },
   "dependencies": {
     "@bigfunger/decompress-zip": "0.2.0-stripfix2",
+    "@elastic/datemath": "2.2.0",
     "@spalger/angular-bootstrap": "0.12.1",
     "@spalger/filesaver": "1.1.2",
     "@spalger/leaflet-draw": "0.2.3",

src/plugins/kibana/public/discover/controllers/discover.js

@@ -3,7 +3,7 @@ import angular from 'angular';
 import moment from 'moment';
 import getSort from 'ui/doc_table/lib/get_sort';
 import rison from 'rison-node';
-import dateMath from 'ui/utils/date_math';
+import dateMath from '@elastic/datemath';
 import 'ui/doc_table';
 import 'ui/visualize';
 import 'ui/notify';

src/ui/public/directives/pretty_duration.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import dateMath from 'ui/utils/date_math';
+import dateMath from '@elastic/datemath';
 import moment from 'moment';
 import 'ui/timepicker/quick_ranges';
 import 'ui/timepicker/time_units';

src/ui/public/directives/validate_date_math.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import dateMath from 'ui/utils/date_math';
+import dateMath from '@elastic/datemath';
 import uiModules from 'ui/modules';
 
 uiModules.get('kibana').directive('validateDateMath', function () {

src/ui/public/time_buckets/calc_es_interval.js

@@ -1,5 +1,5 @@
 import moment from 'moment';
-import dateMath from 'ui/utils/date_math';
+import dateMath from '@elastic/datemath';
 export default function () {
 
   let unitsDesc = dateMath.unitsDesc;

src/ui/public/time_buckets/time_buckets.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import moment from 'moment';
-import dateMath from 'ui/utils/date_math';
+import dateMath from '@elastic/datemath';
 import parseInterval from 'ui/utils/parse_interval';
 import TimeBucketsCalcAutoIntervalProvider from 'ui/time_buckets/calc_auto_interval';
 import TimeBucketsCalcEsIntervalProvider from 'ui/time_buckets/calc_es_interval';

src/ui/public/timefilter/timefilter.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import angular from 'angular';
 import moment from 'moment';
-import dateMath from 'ui/utils/date_math';
+import dateMath from '@elastic/datemath';
 import 'ui/state_management/global_state';
 import 'ui/config';
 import EventsProvider from 'ui/events';

src/ui/public/timepicker/timepicker.js

@@ -1,6 +1,6 @@
 import html from 'ui/timepicker/timepicker.html';
 import _ from 'lodash';
-import dateMath from 'ui/utils/date_math';
+import dateMath from '@elastic/datemath';
 import moment from 'moment';
 import Notifier from 'ui/notify/notifier';
 import 'ui/directives/input_datetime';

src/ui/public/utils/parse_interval.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import moment from 'moment';
-import dateMath from 'ui/utils/date_math';
+import dateMath from '@elastic/datemath';
 
 // Assume interval is in the form (value)(unit), such as "1h"
 let INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$');

src/ui/public/vislib/visualizations/time_marker.js

@@ -1,5 +1,5 @@
 import d3 from 'd3';
-import dateMath from 'ui/utils/date_math';
+import dateMath from '@elastic/datemath';
 export default function TimeMarkerFactory() {
 
   function TimeMarker(times, xScale, height) {