From: Tremayne Christ <info@tremaynechrist.co.uk>
Date: Fri, 24 Apr 2020 11:41:32 +0000 (+0100)
Subject: [bugfix] Fix circular dependency issue (#4906)
X-Git-Tag: 2.25.0~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b285b5e9dbbf27be238f0c1723342ff19c1dc0a3;p=thirdparty%2Fmoment.git

[bugfix] Fix circular dependency issue (#4906)

* split out isLeapYear into separate util

* update month to use isLeapYear util for consistency
---

diff --git a/src/lib/moment/get-set.js b/src/lib/moment/get-set.js
index f5035f1a4..f69d09c97 100644
--- a/src/lib/moment/get-set.js
+++ b/src/lib/moment/get-set.js
@@ -3,7 +3,7 @@ import { getPrioritizedUnits } from '../units/priorities';
 import { hooks } from '../utils/hooks';
 import isFunction from '../utils/is-function';
 import { daysInMonth } from '../units/month';
-import { isLeapYear } from '../units/year';
+import { isLeapYear } from '../utils/is-leap-year';
 
 export function makeGetSet (unit, keepTime) {
     return function (value) {
diff --git a/src/lib/units/month.js b/src/lib/units/month.js
index f504ed35e..b645373bd 100644
--- a/src/lib/units/month.js
+++ b/src/lib/units/month.js
@@ -14,7 +14,7 @@ import mod from '../utils/mod';
 import indexOf from '../utils/index-of';
 import { createUTC } from '../create/utc';
 import getParsingFlags from '../create/parsing-flags';
-import { isLeapYear } from '../units/year';
+import { isLeapYear } from '../utils/is-leap-year';
 
 export function daysInMonth(year, month) {
     if (isNaN(year) || isNaN(month)) {
diff --git a/src/lib/units/year.js b/src/lib/units/year.js
index 8f3f94cda..ccbad583e 100644
--- a/src/lib/units/year.js
+++ b/src/lib/units/year.js
@@ -4,6 +4,7 @@ import { addUnitAlias } from './aliases';
 import { addUnitPriority } from './priorities';
 import { addRegexToken, match1to2, match1to4, match1to6, match2, match4, match6, matchSigned } from '../parse/regex';
 import { addParseToken } from '../parse/token';
+import { isLeapYear } from '../utils/is-leap-year';
 import { hooks } from '../utils/hooks';
 import { YEAR } from './constants';
 import toInt from '../utils/to-int';
@@ -56,9 +57,7 @@ export function daysInYear(year) {
     return isLeapYear(year) ? 366 : 365;
 }
 
-export function isLeapYear(year) {
-    return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
-}
+export { isLeapYear };
 
 // HOOKS
 
diff --git a/src/lib/utils/is-leap-year.js b/src/lib/utils/is-leap-year.js
new file mode 100644
index 000000000..e399d9360
--- /dev/null
+++ b/src/lib/utils/is-leap-year.js
@@ -0,0 +1,3 @@
+export function isLeapYear(year) {
+    return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+}