github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "[6.2] [yarn] remove locked moment resolution (#16418)" (#16448)

Browse source 
This reverts commit ac719d4b0f.
This commit is contained in:
Spencer 2018-01-31 13:24:49 -07:00 • committed by GitHub
parent ac719d4b0f
commit 9bfb11b2ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
package.json
View file

@ -158,8 +158,8 @@
"markdown-it": "8.3.2",
"minimatch": "2.0.10",
"mkdirp": "0.5.1",
"moment": "^2.20.1",
"moment-timezone": "^0.5.14",
"moment": "2.13.0",
"moment-timezone": "0.5.4",
"mustache": "2.3.0",
"ngreact": "0.5.1",
"no-ui-slider": "1.2.0",
@ -309,7 +309,8 @@
"yo": "2.0.0"
},
"resolutions": {
"angular": "1.6.5"
"angular": "1.6.5",
"moment": "2.13.0"
},
"engines": {
"node": "6.12.2",

5
src/core_plugins/kibana/common/field_formats/types/__tests__/date.js
View file

@ -42,8 +42,7 @@ describe('Date Format', function () {
expect(chicagoTime).not.to.equal(phoenixTime);
});
it('should return the value itself when it cannot successfully be formatted', function () {
const dateMath = 'now+1M/d';
expect(convert(dateMath)).to.be(dateMath);
it('should parse date math values', function () {
expect(convert('2015-01-01||+1M/d')).to.be('January 1st 2015, 00:00:00.000');
});
});

5
src/core_plugins/kibana/public/field_formats/__tests__/_date.js
View file

@ -47,8 +47,7 @@ describe('Date Format', function () {
off();
});
it('should return the value itself when it cannot successfully be formatted', function () {
const dateMath = 'now+1M/d';
expect(convert(dateMath)).to.be(dateMath);
it('should parse date math values', function () {
expect(convert('2015-01-01||+1M/d')).to.be('January 1st 2015, 00:00:00.000');
});
});

2
src/ui/public/directives/__tests__/timepicker.js
View file

@ -348,7 +348,7 @@ describe('timepicker directive', function () {
$scope.$digest();
const startDate = moment('1980-01-01T00:11:02.001Z');
const endDate = moment('1983-10-11T00:03:32.051Z');
const endDate = moment('1983-10-11T0=40:03:32.051Z');
$parentScope.timefilter.time.from = startDate;
$parentScope.timefilter.time.to = endDate;

14
yarn.lock
View file

@ -7816,15 +7816,15 @@ module-not-found-error@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0"
moment-timezone@^0.5.14:
version "0.5.14"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.14.tgz#4eb38ff9538b80108ba467a458f3ed4268ccfcb1"
moment-timezone@0.5.4:
version "0.5.4"
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.4.tgz#b6188b8f08557ea9ffb0d42899f5b171e1858e93"
dependencies:
moment ">= 2.9.0"
moment ">= 2.6.0"
moment@2.x.x, "moment@>= 2.9.0", moment@^2.10.3, moment@^2.10.6, moment@^2.13.0, moment@^2.20.1, moment@^2.7.0:
version "2.20.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
moment@2.13.0, moment@2.x.x, "moment@>= 2.6.0", moment@^2.10.3, moment@^2.10.6, moment@^2.13.0, moment@^2.7.0:
version "2.13.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.13.0.tgz#24162d99521e6d40f99ae6939e806d2139eaac52"
mri@1.1.0:
version "1.1.0"