diff --git a/dist/libCommon-v6.1.5.js b/dist/libCommon-v6.1.5.js index 908fa3b5..3b04519d 100644 --- a/dist/libCommon-v6.1.5.js +++ b/dist/libCommon-v6.1.5.js @@ -10332,7 +10332,7 @@ function(window, angular) { return secondStr && result.push(parseInt(secondStr, 10)), result; } function configFromRFC2822(config) { - var obsOffset, hm, m = rfc2822.exec(config._i.replace(/\([^)]*\)|[\n\t]/g, " ").replace(/(\s\s+)/g, " ").replace(/^\s\s*/, "").replace(/\s\s*$/, "")); + var obsOffset, hm, m = rfc2822.exec(config._i.replace(/\([^()]*\)|[\n\t]/g, " ").replace(/(\s\s+)/g, " ").replace(/^\s\s*/, "").replace(/\s\s*$/, "")); m ? (hm = extractFromRFC2822Strings(m[4], m[3], m[2], m[5], m[6], m[7]), function(weekdayStr, parsedInput, config) { return !weekdayStr || defaultLocaleWeekdaysShort.indexOf(weekdayStr) === new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay() || (getParsingFlags(config).weekdayMismatch = !0, void (config._isValid = !1)); @@ -11374,7 +11374,7 @@ function(window, angular) { config._d = new Date(1e3 * parseFloat(input)); }), addParseToken("x", function(input, array, config) { config._d = new Date(toInt(input)); - }), hooks.version = "2.29.2", hookCallback = createLocal, hooks.fn = proto, hooks.min = function() { + }), hooks.version = "2.29.4", hookCallback = createLocal, hooks.fn = proto, hooks.min = function() { return pickBy("isBefore", [].slice.call(arguments, 0)); }, hooks.max = function() { return pickBy("isAfter", [].slice.call(arguments, 0)); diff --git a/package.json b/package.json index b55d2fbd..5d62cfd0 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "less": "3.11.1", "load-grunt-tasks": "^3.5.0", "lodash": "^4.17.21", - "moment": "2.29.2", + "moment": "2.29.4", "nanoscroller": "^0.8.7", "ng-autofocus": "~0.0.1", "ng-file-upload": "3.0.7", @@ -82,12 +82,11 @@ "karma-ng-html2js-preprocessor": "^1.0.0" }, "resolutions": { - "**/angular": "1.8.3", + "**/angular": "~1.8", "**/async": "3.2.2", "**/shelljs": ">=0.8.5", "**/json-schema": ">=0.4.0", "**/xmlhttprequest-ssl": "1.6.2", - "**/angular": "~1.8", "**/ws": "7.4.6", "**/lodash": "^4.17.21", "**/hosted-git-info": "3.0.8", diff --git a/yarn.lock b/yarn.lock index b1ebd6ad..381fa6b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4005,7 +4005,12 @@ mkdirp@~1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -moment@2.29.2, "moment@>=2.8.0 <3.0.0": +moment@2.29.4: + version "2.29.4" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== + +"moment@>=2.8.0 <3.0.0": version "2.29.2" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4" integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==