Merge pull request #251 from sequentech/merge-security-70x

Merge security updates into 7.0.x

dist/libCommon-v7.0.0-beta.1.js

@@ -1959,7 +1959,7 @@ function RNG(seed) {
     }
     function minErr(module, ErrorConstructor) {
         ErrorConstructor = ErrorConstructor || Error;
-        var url = "https://errors.angularjs.org/1.8.2/", regex = url.replace(".", "\\.") + "[\\s\\S]*", errRegExp = new RegExp(regex, "g");
+        var url = "https://errors.angularjs.org/1.8.3/", regex = url.replace(".", "\\.") + "[\\s\\S]*", errRegExp = new RegExp(regex, "g");
         return function() {
             var paramPrefix, i, code = arguments[0], template = arguments[1], message = "[" + (module ? module + ":" : "") + code + "] ", templateArgs = sliceArgs(arguments, 2).map(function(arg) {
                 return toDebugString(arg, minErrConfig.objectMaxDepth);
@@ -2491,11 +2491,11 @@ function RNG(seed) {
         }(obj, maxDepth) : obj;
     }
     var version = {
-        full: "1.8.2",
+        full: "1.8.3",
         major: 1,
         minor: 8,
-        dot: 2,
-        codeName: "meteoric-mining"
+        dot: 3,
+        codeName: "ultimate-farewell"
     };
     JQLite.expando = "ng339";
     var jqCache = JQLite.cache = {}, jqId = 1;
@@ -9490,7 +9490,7 @@ function RNG(seed) {
                 $$cookieReader: $$CookieReaderProvider
             });
         } ]).info({
-            angularVersion: "1.8.2"
+            angularVersion: "1.8.3"
         });
     }(angular), angular.module("ngLocale", [], [ "$provide", function($provide) {
         var PLURAL_CATEGORY_ONE = "one", PLURAL_CATEGORY_OTHER = "other";
@@ -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));

package.json

@@ -19,7 +19,7 @@
     "@bower_components/ng-i18next": "i18next/ng-i18next#0.4.2",
     "@bower_components/ngInfiniteScroll": "sroze/ngInfiniteScroll#1.2.0",
     "@lodder/grunt-postcss": "^3.0.0",
-    "angular": "~1.8.0",
+    "angular": "~1.8.3",
     "angular-animate": "~1.8.0",
     "angular-cookie": "~4.0.9",
     "angular-cookies": "~1.8.0",
@@ -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,16 +82,16 @@
     "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",
     "**/minimist": "1.2.6",
+    "**/moment": "2.29.4",
     "**/yargs-parser": "13.1.2",
     "**/cheerio": "0.12.3",
     "**/cheerio-select": "0.0.3",

yarn.lock

@@ -204,11 +204,16 @@ angular-sanitize@~1.8.0:
   resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.8.2.tgz#ae78040f00c5e2ce1c63780bcc47fa14a1698296"
   integrity sha512-OB6Goa+QN3byf5asQ7XRl7DKZejm/F/ZOqa9z1skqYVOWA2hoBxoCmt9E7+i7T/TbxZP5zYzKxNZVVJNu860Hg==
 
-angular@^1.0.8, angular@~1.8, angular@~1.8.0:
+angular@^1.0.8, angular@~1.8:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/angular/-/angular-1.8.2.tgz#5983bbb5a9fa63e213cb7749199e0d352de3a2f1"
   integrity sha512-IauMOej2xEe7/7Ennahkbb5qd/HFADiNuLSESz9Q27inmi32zB0lnAsFeLEWcox3Gd1F6YhNd1CP7/9IukJ0Gw==
 
+angular@~1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/angular/-/angular-1.8.3.tgz#851ad75d5163c105a7e329555ef70c90aa706894"
+  integrity sha512-5qjkWIQQVsHj4Sb5TcEs4WZWpFeVFHXwxEBHUhrny41D8UrBAd6T/6nPPAsLngJCReIOqi95W3mxdveveutpZw==
+
 ansi-regex@5.0.1, ansi-regex@^0.2.0, ansi-regex@^0.2.1, ansi-regex@^2.0.0, ansi-regex@^3.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -4000,10 +4005,10 @@ 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":
-  version "2.29.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
-  integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
+moment@2.29.4, "moment@>=2.8.0 <3.0.0":
+  version "2.29.4"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
+  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
 morgan@^1.9.1:
   version "1.10.0"