@mparticle/web-sdk 2.18.2 → 2.19.0

package/dist/mparticle.js

@@ -725,7 +725,7 @@ var mParticle = (function () {
       Environment: Environment
     };
 
-    var version = "2.18.2";
+    var version = "2.19.0";
 
     var Constants = {
       sdkVersion: version,
@@ -1244,6 +1244,173 @@ var mParticle = (function () {
     	})(exports.UserIdentityChangeEventEventTypeEnum || (exports.UserIdentityChangeEventEventTypeEnum = {}));
     } (dist));
 
+    var slugify$1 = {exports: {}};
+
+    (function (module, exports) {
+    (function (name, root, factory) {
+    	  {
+    	    module.exports = factory();
+    	    module.exports['default'] = factory();
+    	  }
+    	}('slugify', commonjsGlobal, function () {
+    	  var charMap = JSON.parse('{"$":"dollar","%":"percent","&":"and","<":"less",">":"greater","|":"or","¢":"cent","£":"pound","¤":"currency","¥":"yen","©":"(c)","ª":"a","®":"(r)","º":"o","À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","Æ":"AE","Ç":"C","È":"E","É":"E","Ê":"E","Ë":"E","Ì":"I","Í":"I","Î":"I","Ï":"I","Ð":"D","Ñ":"N","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","Ù":"U","Ú":"U","Û":"U","Ü":"U","Ý":"Y","Þ":"TH","ß":"ss","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","æ":"ae","ç":"c","è":"e","é":"e","ê":"e","ë":"e","ì":"i","í":"i","î":"i","ï":"i","ð":"d","ñ":"n","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","ù":"u","ú":"u","û":"u","ü":"u","ý":"y","þ":"th","ÿ":"y","Ā":"A","ā":"a","Ă":"A","ă":"a","Ą":"A","ą":"a","Ć":"C","ć":"c","Č":"C","č":"c","Ď":"D","ď":"d","Đ":"DJ","đ":"dj","Ē":"E","ē":"e","Ė":"E","ė":"e","Ę":"e","ę":"e","Ě":"E","ě":"e","Ğ":"G","ğ":"g","Ģ":"G","ģ":"g","Ĩ":"I","ĩ":"i","Ī":"i","ī":"i","Į":"I","į":"i","İ":"I","ı":"i","Ķ":"k","ķ":"k","Ļ":"L","ļ":"l","Ľ":"L","ľ":"l","Ł":"L","ł":"l","Ń":"N","ń":"n","Ņ":"N","ņ":"n","Ň":"N","ň":"n","Ō":"O","ō":"o","Ő":"O","ő":"o","Œ":"OE","œ":"oe","Ŕ":"R","ŕ":"r","Ř":"R","ř":"r","Ś":"S","ś":"s","Ş":"S","ş":"s","Š":"S","š":"s","Ţ":"T","ţ":"t","Ť":"T","ť":"t","Ũ":"U","ũ":"u","Ū":"u","ū":"u","Ů":"U","ů":"u","Ű":"U","ű":"u","Ų":"U","ų":"u","Ŵ":"W","ŵ":"w","Ŷ":"Y","ŷ":"y","Ÿ":"Y","Ź":"Z","ź":"z","Ż":"Z","ż":"z","Ž":"Z","ž":"z","Ə":"E","ƒ":"f","Ơ":"O","ơ":"o","Ư":"U","ư":"u","Lj":"LJ","lj":"lj","Nj":"NJ","nj":"nj","Ș":"S","ș":"s","Ț":"T","ț":"t","ə":"e","˚":"o","Ά":"A","Έ":"E","Ή":"H","Ί":"I","Ό":"O","Ύ":"Y","Ώ":"W","ΐ":"i","Α":"A","Β":"B","Γ":"G","Δ":"D","Ε":"E","Ζ":"Z","Η":"H","Θ":"8","Ι":"I","Κ":"K","Λ":"L","Μ":"M","Ν":"N","Ξ":"3","Ο":"O","Π":"P","Ρ":"R","Σ":"S","Τ":"T","Υ":"Y","Φ":"F","Χ":"X","Ψ":"PS","Ω":"W","Ϊ":"I","Ϋ":"Y","ά":"a","έ":"e","ή":"h","ί":"i","ΰ":"y","α":"a","β":"b","γ":"g","δ":"d","ε":"e","ζ":"z","η":"h","θ":"8","ι":"i","κ":"k","λ":"l","μ":"m","ν":"n","ξ":"3","ο":"o","π":"p","ρ":"r","ς":"s","σ":"s","τ":"t","υ":"y","φ":"f","χ":"x","ψ":"ps","ω":"w","ϊ":"i","ϋ":"y","ό":"o","ύ":"y","ώ":"w","Ё":"Yo","Ђ":"DJ","Є":"Ye","І":"I","Ї":"Yi","Ј":"J","Љ":"LJ","Њ":"NJ","Ћ":"C","Џ":"DZ","А":"A","Б":"B","В":"V","Г":"G","Д":"D","Е":"E","Ж":"Zh","З":"Z","И":"I","Й":"J","К":"K","Л":"L","М":"M","Н":"N","О":"O","П":"P","Р":"R","С":"S","Т":"T","У":"U","Ф":"F","Х":"H","Ц":"C","Ч":"Ch","Ш":"Sh","Щ":"Sh","Ъ":"U","Ы":"Y","Ь":"","Э":"E","Ю":"Yu","Я":"Ya","а":"a","б":"b","в":"v","г":"g","д":"d","е":"e","ж":"zh","з":"z","и":"i","й":"j","к":"k","л":"l","м":"m","н":"n","о":"o","п":"p","р":"r","с":"s","т":"t","у":"u","ф":"f","х":"h","ц":"c","ч":"ch","ш":"sh","щ":"sh","ъ":"u","ы":"y","ь":"","э":"e","ю":"yu","я":"ya","ё":"yo","ђ":"dj","є":"ye","і":"i","ї":"yi","ј":"j","љ":"lj","њ":"nj","ћ":"c","ѝ":"u","џ":"dz","Ґ":"G","ґ":"g","Ғ":"GH","ғ":"gh","Қ":"KH","қ":"kh","Ң":"NG","ң":"ng","Ү":"UE","ү":"ue","Ұ":"U","ұ":"u","Һ":"H","һ":"h","Ә":"AE","ә":"ae","Ө":"OE","ө":"oe","Ա":"A","Բ":"B","Գ":"G","Դ":"D","Ե":"E","Զ":"Z","Է":"E\'","Ը":"Y\'","Թ":"T\'","Ժ":"JH","Ի":"I","Լ":"L","Խ":"X","Ծ":"C\'","Կ":"K","Հ":"H","Ձ":"D\'","Ղ":"GH","Ճ":"TW","Մ":"M","Յ":"Y","Ն":"N","Շ":"SH","Չ":"CH","Պ":"P","Ջ":"J","Ռ":"R\'","Ս":"S","Վ":"V","Տ":"T","Ր":"R","Ց":"C","Փ":"P\'","Ք":"Q\'","Օ":"O\'\'","Ֆ":"F","և":"EV","ء":"a","آ":"aa","أ":"a","ؤ":"u","إ":"i","ئ":"e","ا":"a","ب":"b","ة":"h","ت":"t","ث":"th","ج":"j","ح":"h","خ":"kh","د":"d","ذ":"th","ر":"r","ز":"z","س":"s","ش":"sh","ص":"s","ض":"dh","ط":"t","ظ":"z","ع":"a","غ":"gh","ف":"f","ق":"q","ك":"k","ل":"l","م":"m","ن":"n","ه":"h","و":"w","ى":"a","ي":"y","ً":"an","ٌ":"on","ٍ":"en","َ":"a","ُ":"u","ِ":"e","ْ":"","٠":"0","١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","پ":"p","چ":"ch","ژ":"zh","ک":"k","گ":"g","ی":"y","۰":"0","۱":"1","۲":"2","۳":"3","۴":"4","۵":"5","۶":"6","۷":"7","۸":"8","۹":"9","฿":"baht","ა":"a","ბ":"b","გ":"g","დ":"d","ე":"e","ვ":"v","ზ":"z","თ":"t","ი":"i","კ":"k","ლ":"l","მ":"m","ნ":"n","ო":"o","პ":"p","ჟ":"zh","რ":"r","ს":"s","ტ":"t","უ":"u","ფ":"f","ქ":"k","ღ":"gh","ყ":"q","შ":"sh","ჩ":"ch","ც":"ts","ძ":"dz","წ":"ts","ჭ":"ch","ხ":"kh","ჯ":"j","ჰ":"h","Ṣ":"S","ṣ":"s","Ẁ":"W","ẁ":"w","Ẃ":"W","ẃ":"w","Ẅ":"W","ẅ":"w","ẞ":"SS","Ạ":"A","ạ":"a","Ả":"A","ả":"a","Ấ":"A","ấ":"a","Ầ":"A","ầ":"a","Ẩ":"A","ẩ":"a","Ẫ":"A","ẫ":"a","Ậ":"A","ậ":"a","Ắ":"A","ắ":"a","Ằ":"A","ằ":"a","Ẳ":"A","ẳ":"a","Ẵ":"A","ẵ":"a","Ặ":"A","ặ":"a","Ẹ":"E","ẹ":"e","Ẻ":"E","ẻ":"e","Ẽ":"E","ẽ":"e","Ế":"E","ế":"e","Ề":"E","ề":"e","Ể":"E","ể":"e","Ễ":"E","ễ":"e","Ệ":"E","ệ":"e","Ỉ":"I","ỉ":"i","Ị":"I","ị":"i","Ọ":"O","ọ":"o","Ỏ":"O","ỏ":"o","Ố":"O","ố":"o","Ồ":"O","ồ":"o","Ổ":"O","ổ":"o","Ỗ":"O","ỗ":"o","Ộ":"O","ộ":"o","Ớ":"O","ớ":"o","Ờ":"O","ờ":"o","Ở":"O","ở":"o","Ỡ":"O","ỡ":"o","Ợ":"O","ợ":"o","Ụ":"U","ụ":"u","Ủ":"U","ủ":"u","Ứ":"U","ứ":"u","Ừ":"U","ừ":"u","Ử":"U","ử":"u","Ữ":"U","ữ":"u","Ự":"U","ự":"u","Ỳ":"Y","ỳ":"y","Ỵ":"Y","ỵ":"y","Ỷ":"Y","ỷ":"y","Ỹ":"Y","ỹ":"y","–":"-","‘":"\'","’":"\'","“":"\\\"","”":"\\\"","„":"\\\"","†":"+","•":"*","…":"...","₠":"ecu","₢":"cruzeiro","₣":"french franc","₤":"lira","₥":"mill","₦":"naira","₧":"peseta","₨":"rupee","₩":"won","₪":"new shequel","₫":"dong","€":"euro","₭":"kip","₮":"tugrik","₯":"drachma","₰":"penny","₱":"peso","₲":"guarani","₳":"austral","₴":"hryvnia","₵":"cedi","₸":"kazakhstani tenge","₹":"indian rupee","₺":"turkish lira","₽":"russian ruble","₿":"bitcoin","℠":"sm","™":"tm","∂":"d","∆":"delta","∑":"sum","∞":"infinity","♥":"love","元":"yuan","円":"yen","﷼":"rial","ﻵ":"laa","ﻷ":"laa","ﻹ":"lai","ﻻ":"la"}');
+    	  var locales = JSON.parse('{"bg":{"Й":"Y","Ц":"Ts","Щ":"Sht","Ъ":"A","Ь":"Y","й":"y","ц":"ts","щ":"sht","ъ":"a","ь":"y"},"de":{"Ä":"AE","ä":"ae","Ö":"OE","ö":"oe","Ü":"UE","ü":"ue","ß":"ss","%":"prozent","&":"und","|":"oder","∑":"summe","∞":"unendlich","♥":"liebe"},"es":{"%":"por ciento","&":"y","<":"menor que",">":"mayor que","|":"o","¢":"centavos","£":"libras","¤":"moneda","₣":"francos","∑":"suma","∞":"infinito","♥":"amor"},"fr":{"%":"pourcent","&":"et","<":"plus petit",">":"plus grand","|":"ou","¢":"centime","£":"livre","¤":"devise","₣":"franc","∑":"somme","∞":"infini","♥":"amour"},"pt":{"%":"porcento","&":"e","<":"menor",">":"maior","|":"ou","¢":"centavo","∑":"soma","£":"libra","∞":"infinito","♥":"amor"},"uk":{"И":"Y","и":"y","Й":"Y","й":"y","Ц":"Ts","ц":"ts","Х":"Kh","х":"kh","Щ":"Shch","щ":"shch","Г":"H","г":"h"},"vi":{"Đ":"D","đ":"d"},"da":{"Ø":"OE","ø":"oe","Å":"AA","å":"aa","%":"procent","&":"og","|":"eller","$":"dollar","<":"mindre end",">":"større end"},"nb":{"&":"og","Å":"AA","Æ":"AE","Ø":"OE","å":"aa","æ":"ae","ø":"oe"},"it":{"&":"e"},"nl":{"&":"en"},"sv":{"&":"och","Å":"AA","Ä":"AE","Ö":"OE","å":"aa","ä":"ae","ö":"oe"}}');
+
+    	  function replace (string, options) {
+    	    if (typeof string !== 'string') {
+    	      throw new Error('slugify: string argument expected')
+    	    }
+
+    	    options = (typeof options === 'string')
+    	      ? {replacement: options}
+    	      : options || {};
+
+    	    var locale = locales[options.locale] || {};
+
+    	    var replacement = options.replacement === undefined ? '-' : options.replacement;
+
+    	    var trim = options.trim === undefined ? true : options.trim;
+
+    	    var slug = string.normalize().split('')
+    	      // replace characters based on charMap
+    	      .reduce(function (result, ch) {
+    	        var appendChar = locale[ch] || charMap[ch] || ch;
+    	        if (appendChar === replacement) {
+    	          appendChar = ' ';
+    	        }
+    	        return result + appendChar
+    	          // remove not allowed characters
+    	          .replace(options.remove || /[^\w\s$*_+~.()'"!\-:@]+/g, '')
+    	      }, '');
+
+    	    if (options.strict) {
+    	      slug = slug.replace(/[^A-Za-z0-9\s]/g, '');
+    	    }
+
+    	    if (trim) {
+    	      slug = slug.trim();
+    	    }
+
+    	    // Replace spaces with replacement character, treating multiple consecutive
+    	    // spaces as a single space.
+    	    slug = slug.replace(/\s+/g, replacement);
+
+    	    if (options.lower) {
+    	      slug = slug.toLowerCase();
+    	    }
+
+    	    return slug
+    	  }
+
+    	  replace.extend = function (customMap) {
+    	    Object.assign(charMap, customMap);
+    	  };
+
+    	  return replace
+    	}));
+    } (slugify$1));
+
+    var slugify = slugify$1.exports;
+
+    var inArray = function inArray(items, name) {
+      var i = 0;
+
+      if (Array.prototype.indexOf) {
+        return items.indexOf(name, 0) >= 0;
+      } else {
+        for (var n = items.length; i < n; i++) {
+          if (i in items && items[i] === name) {
+            return true;
+          }
+        }
+      }
+
+      return false;
+    };
+
+    var findKeyInObject = function findKeyInObject(obj, key) {
+      if (key && obj) {
+        for (var prop in obj) {
+          if (obj.hasOwnProperty(prop) && prop.toLowerCase() === key.toLowerCase()) {
+            return prop;
+          }
+        }
+      }
+
+      return null;
+    };
+
+    var isObject = function isObject(value) {
+      var objType = Object.prototype.toString.call(value);
+      return objType === '[object Object]' || objType === '[object Error]';
+    };
+
+    var parseNumber = function parseNumber(value) {
+      if (isNaN(value) || !isFinite(value)) {
+        return 0;
+      }
+
+      var floatValue = parseFloat(value);
+      return isNaN(floatValue) ? 0 : floatValue;
+    };
+
+    var parseStringOrNumber = function parseStringOrNumber(value) {
+      if (isStringOrNumber(value)) {
+        return value;
+      } else {
+        return null;
+      }
+    }; // FIXME: REFACTOR for V3
+    // only used in store.js to sanitize server-side formatting of
+    // booleans when checking for `isDevelopmentMode`
+    // Should be removed in v3
+
+
+    var returnConvertedBoolean = function returnConvertedBoolean(data) {
+      if (data === 'false' || data === '0') {
+        return false;
+      } else {
+        return Boolean(data);
+      }
+    };
+
+    var decoded = function decoded(s) {
+      return decodeURIComponent(s.replace(/\+/g, ' '));
+    };
+
+    var converted = function converted(s) {
+      if (s.indexOf('"') === 0) {
+        s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+      }
+
+      return s;
+    };
+
+    var isString = function isString(value) {
+      return typeof value === 'string';
+    };
+
+    var isNumber = function isNumber(value) {
+      return typeof value === 'number';
+    };
+
+    var isFunction = function isFunction(fn) {
+      return typeof fn === 'function';
+    }; // TODO: Refactor this to a regex
+
+
+    var isDataPlanSlug = function isDataPlanSlug(str) {
+      return isString(str) && str === slugify(str);
+    };
+
+    var isStringOrNumber = function isStringOrNumber(value) {
+      return isString(value) || isNumber(value);
+    };
+
+    var isEmpty = function isEmpty(value) {
+      return value == null || !(Object.keys(value) || value).length;
+    };
+
     function convertEvents(mpid, sdkEvents, mpInstance) {
       if (!mpid) {
         return null;
@@ -1253,6 +1420,7 @@ var mParticle = (function () {
         return null;
       }
 
+      var user = mpInstance.Identity.getCurrentUser();
       var uploadEvents = [];
       var lastEvent = null;
 
@@ -1273,6 +1441,14 @@ var mParticle = (function () {
         return null;
       }
 
+      var currentConsentState = null; // Add the consent state from either the Last Event or the user
+
+      if (!isEmpty(lastEvent.ConsentState)) {
+        currentConsentState = lastEvent.ConsentState;
+      } else if (!isEmpty(user)) {
+        currentConsentState = user.getConsentState();
+      }
+
       var upload = {
         source_request_id: mpInstance._Helpers.generateUniqueId(),
         mpid: mpid,
@@ -1293,7 +1469,7 @@ var mParticle = (function () {
         },
         user_attributes: lastEvent.UserAttributes,
         user_identities: convertUserIdentities(lastEvent.UserIdentities),
-        consent_state: convertConsentState(lastEvent.ConsentState),
+        consent_state: convertConsentState(currentConsentState),
         integration_attributes: lastEvent.IntegrationAttributes
       };
 
@@ -1309,7 +1485,7 @@ var mParticle = (function () {
       return upload;
     }
     function convertConsentState(sdkConsentState) {
-      if (!sdkConsentState) {
+      if (isEmpty(sdkConsentState)) {
         return null;
       }
 
@@ -1935,179 +2111,27 @@ var mParticle = (function () {
       }
     }
 
-    var slugify$1 = {exports: {}};
-
-    (function (module, exports) {
-    (function (name, root, factory) {
-    	  {
-    	    module.exports = factory();
-    	    module.exports['default'] = factory();
-    	  }
-    	}('slugify', commonjsGlobal, function () {
-    	  var charMap = JSON.parse('{"$":"dollar","%":"percent","&":"and","<":"less",">":"greater","|":"or","¢":"cent","£":"pound","¤":"currency","¥":"yen","©":"(c)","ª":"a","®":"(r)","º":"o","À":"A","Á":"A","Â":"A","Ã":"A","Ä":"A","Å":"A","Æ":"AE","Ç":"C","È":"E","É":"E","Ê":"E","Ë":"E","Ì":"I","Í":"I","Î":"I","Ï":"I","Ð":"D","Ñ":"N","Ò":"O","Ó":"O","Ô":"O","Õ":"O","Ö":"O","Ø":"O","Ù":"U","Ú":"U","Û":"U","Ü":"U","Ý":"Y","Þ":"TH","ß":"ss","à":"a","á":"a","â":"a","ã":"a","ä":"a","å":"a","æ":"ae","ç":"c","è":"e","é":"e","ê":"e","ë":"e","ì":"i","í":"i","î":"i","ï":"i","ð":"d","ñ":"n","ò":"o","ó":"o","ô":"o","õ":"o","ö":"o","ø":"o","ù":"u","ú":"u","û":"u","ü":"u","ý":"y","þ":"th","ÿ":"y","Ā":"A","ā":"a","Ă":"A","ă":"a","Ą":"A","ą":"a","Ć":"C","ć":"c","Č":"C","č":"c","Ď":"D","ď":"d","Đ":"DJ","đ":"dj","Ē":"E","ē":"e","Ė":"E","ė":"e","Ę":"e","ę":"e","Ě":"E","ě":"e","Ğ":"G","ğ":"g","Ģ":"G","ģ":"g","Ĩ":"I","ĩ":"i","Ī":"i","ī":"i","Į":"I","į":"i","İ":"I","ı":"i","Ķ":"k","ķ":"k","Ļ":"L","ļ":"l","Ľ":"L","ľ":"l","Ł":"L","ł":"l","Ń":"N","ń":"n","Ņ":"N","ņ":"n","Ň":"N","ň":"n","Ō":"O","ō":"o","Ő":"O","ő":"o","Œ":"OE","œ":"oe","Ŕ":"R","ŕ":"r","Ř":"R","ř":"r","Ś":"S","ś":"s","Ş":"S","ş":"s","Š":"S","š":"s","Ţ":"T","ţ":"t","Ť":"T","ť":"t","Ũ":"U","ũ":"u","Ū":"u","ū":"u","Ů":"U","ů":"u","Ű":"U","ű":"u","Ų":"U","ų":"u","Ŵ":"W","ŵ":"w","Ŷ":"Y","ŷ":"y","Ÿ":"Y","Ź":"Z","ź":"z","Ż":"Z","ż":"z","Ž":"Z","ž":"z","Ə":"E","ƒ":"f","Ơ":"O","ơ":"o","Ư":"U","ư":"u","Lj":"LJ","lj":"lj","Nj":"NJ","nj":"nj","Ș":"S","ș":"s","Ț":"T","ț":"t","ə":"e","˚":"o","Ά":"A","Έ":"E","Ή":"H","Ί":"I","Ό":"O","Ύ":"Y","Ώ":"W","ΐ":"i","Α":"A","Β":"B","Γ":"G","Δ":"D","Ε":"E","Ζ":"Z","Η":"H","Θ":"8","Ι":"I","Κ":"K","Λ":"L","Μ":"M","Ν":"N","Ξ":"3","Ο":"O","Π":"P","Ρ":"R","Σ":"S","Τ":"T","Υ":"Y","Φ":"F","Χ":"X","Ψ":"PS","Ω":"W","Ϊ":"I","Ϋ":"Y","ά":"a","έ":"e","ή":"h","ί":"i","ΰ":"y","α":"a","β":"b","γ":"g","δ":"d","ε":"e","ζ":"z","η":"h","θ":"8","ι":"i","κ":"k","λ":"l","μ":"m","ν":"n","ξ":"3","ο":"o","π":"p","ρ":"r","ς":"s","σ":"s","τ":"t","υ":"y","φ":"f","χ":"x","ψ":"ps","ω":"w","ϊ":"i","ϋ":"y","ό":"o","ύ":"y","ώ":"w","Ё":"Yo","Ђ":"DJ","Є":"Ye","І":"I","Ї":"Yi","Ј":"J","Љ":"LJ","Њ":"NJ","Ћ":"C","Џ":"DZ","А":"A","Б":"B","В":"V","Г":"G","Д":"D","Е":"E","Ж":"Zh","З":"Z","И":"I","Й":"J","К":"K","Л":"L","М":"M","Н":"N","О":"O","П":"P","Р":"R","С":"S","Т":"T","У":"U","Ф":"F","Х":"H","Ц":"C","Ч":"Ch","Ш":"Sh","Щ":"Sh","Ъ":"U","Ы":"Y","Ь":"","Э":"E","Ю":"Yu","Я":"Ya","а":"a","б":"b","в":"v","г":"g","д":"d","е":"e","ж":"zh","з":"z","и":"i","й":"j","к":"k","л":"l","м":"m","н":"n","о":"o","п":"p","р":"r","с":"s","т":"t","у":"u","ф":"f","х":"h","ц":"c","ч":"ch","ш":"sh","щ":"sh","ъ":"u","ы":"y","ь":"","э":"e","ю":"yu","я":"ya","ё":"yo","ђ":"dj","є":"ye","і":"i","ї":"yi","ј":"j","љ":"lj","њ":"nj","ћ":"c","ѝ":"u","џ":"dz","Ґ":"G","ґ":"g","Ғ":"GH","ғ":"gh","Қ":"KH","қ":"kh","Ң":"NG","ң":"ng","Ү":"UE","ү":"ue","Ұ":"U","ұ":"u","Һ":"H","һ":"h","Ә":"AE","ә":"ae","Ө":"OE","ө":"oe","Ա":"A","Բ":"B","Գ":"G","Դ":"D","Ե":"E","Զ":"Z","Է":"E\'","Ը":"Y\'","Թ":"T\'","Ժ":"JH","Ի":"I","Լ":"L","Խ":"X","Ծ":"C\'","Կ":"K","Հ":"H","Ձ":"D\'","Ղ":"GH","Ճ":"TW","Մ":"M","Յ":"Y","Ն":"N","Շ":"SH","Չ":"CH","Պ":"P","Ջ":"J","Ռ":"R\'","Ս":"S","Վ":"V","Տ":"T","Ր":"R","Ց":"C","Փ":"P\'","Ք":"Q\'","Օ":"O\'\'","Ֆ":"F","և":"EV","ء":"a","آ":"aa","أ":"a","ؤ":"u","إ":"i","ئ":"e","ا":"a","ب":"b","ة":"h","ت":"t","ث":"th","ج":"j","ح":"h","خ":"kh","د":"d","ذ":"th","ر":"r","ز":"z","س":"s","ش":"sh","ص":"s","ض":"dh","ط":"t","ظ":"z","ع":"a","غ":"gh","ف":"f","ق":"q","ك":"k","ل":"l","م":"m","ن":"n","ه":"h","و":"w","ى":"a","ي":"y","ً":"an","ٌ":"on","ٍ":"en","َ":"a","ُ":"u","ِ":"e","ْ":"","٠":"0","١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","پ":"p","چ":"ch","ژ":"zh","ک":"k","گ":"g","ی":"y","۰":"0","۱":"1","۲":"2","۳":"3","۴":"4","۵":"5","۶":"6","۷":"7","۸":"8","۹":"9","฿":"baht","ა":"a","ბ":"b","გ":"g","დ":"d","ე":"e","ვ":"v","ზ":"z","თ":"t","ი":"i","კ":"k","ლ":"l","მ":"m","ნ":"n","ო":"o","პ":"p","ჟ":"zh","რ":"r","ს":"s","ტ":"t","უ":"u","ფ":"f","ქ":"k","ღ":"gh","ყ":"q","შ":"sh","ჩ":"ch","ც":"ts","ძ":"dz","წ":"ts","ჭ":"ch","ხ":"kh","ჯ":"j","ჰ":"h","Ṣ":"S","ṣ":"s","Ẁ":"W","ẁ":"w","Ẃ":"W","ẃ":"w","Ẅ":"W","ẅ":"w","ẞ":"SS","Ạ":"A","ạ":"a","Ả":"A","ả":"a","Ấ":"A","ấ":"a","Ầ":"A","ầ":"a","Ẩ":"A","ẩ":"a","Ẫ":"A","ẫ":"a","Ậ":"A","ậ":"a","Ắ":"A","ắ":"a","Ằ":"A","ằ":"a","Ẳ":"A","ẳ":"a","Ẵ":"A","ẵ":"a","Ặ":"A","ặ":"a","Ẹ":"E","ẹ":"e","Ẻ":"E","ẻ":"e","Ẽ":"E","ẽ":"e","Ế":"E","ế":"e","Ề":"E","ề":"e","Ể":"E","ể":"e","Ễ":"E","ễ":"e","Ệ":"E","ệ":"e","Ỉ":"I","ỉ":"i","Ị":"I","ị":"i","Ọ":"O","ọ":"o","Ỏ":"O","ỏ":"o","Ố":"O","ố":"o","Ồ":"O","ồ":"o","Ổ":"O","ổ":"o","Ỗ":"O","ỗ":"o","Ộ":"O","ộ":"o","Ớ":"O","ớ":"o","Ờ":"O","ờ":"o","Ở":"O","ở":"o","Ỡ":"O","ỡ":"o","Ợ":"O","ợ":"o","Ụ":"U","ụ":"u","Ủ":"U","ủ":"u","Ứ":"U","ứ":"u","Ừ":"U","ừ":"u","Ử":"U","ử":"u","Ữ":"U","ữ":"u","Ự":"U","ự":"u","Ỳ":"Y","ỳ":"y","Ỵ":"Y","ỵ":"y","Ỷ":"Y","ỷ":"y","Ỹ":"Y","ỹ":"y","–":"-","‘":"\'","’":"\'","“":"\\\"","”":"\\\"","„":"\\\"","†":"+","•":"*","…":"...","₠":"ecu","₢":"cruzeiro","₣":"french franc","₤":"lira","₥":"mill","₦":"naira","₧":"peseta","₨":"rupee","₩":"won","₪":"new shequel","₫":"dong","€":"euro","₭":"kip","₮":"tugrik","₯":"drachma","₰":"penny","₱":"peso","₲":"guarani","₳":"austral","₴":"hryvnia","₵":"cedi","₸":"kazakhstani tenge","₹":"indian rupee","₺":"turkish lira","₽":"russian ruble","₿":"bitcoin","℠":"sm","™":"tm","∂":"d","∆":"delta","∑":"sum","∞":"infinity","♥":"love","元":"yuan","円":"yen","﷼":"rial","ﻵ":"laa","ﻷ":"laa","ﻹ":"lai","ﻻ":"la"}');
-    	  var locales = JSON.parse('{"bg":{"Й":"Y","Ц":"Ts","Щ":"Sht","Ъ":"A","Ь":"Y","й":"y","ц":"ts","щ":"sht","ъ":"a","ь":"y"},"de":{"Ä":"AE","ä":"ae","Ö":"OE","ö":"oe","Ü":"UE","ü":"ue","ß":"ss","%":"prozent","&":"und","|":"oder","∑":"summe","∞":"unendlich","♥":"liebe"},"es":{"%":"por ciento","&":"y","<":"menor que",">":"mayor que","|":"o","¢":"centavos","£":"libras","¤":"moneda","₣":"francos","∑":"suma","∞":"infinito","♥":"amor"},"fr":{"%":"pourcent","&":"et","<":"plus petit",">":"plus grand","|":"ou","¢":"centime","£":"livre","¤":"devise","₣":"franc","∑":"somme","∞":"infini","♥":"amour"},"pt":{"%":"porcento","&":"e","<":"menor",">":"maior","|":"ou","¢":"centavo","∑":"soma","£":"libra","∞":"infinito","♥":"amor"},"uk":{"И":"Y","и":"y","Й":"Y","й":"y","Ц":"Ts","ц":"ts","Х":"Kh","х":"kh","Щ":"Shch","щ":"shch","Г":"H","г":"h"},"vi":{"Đ":"D","đ":"d"},"da":{"Ø":"OE","ø":"oe","Å":"AA","å":"aa","%":"procent","&":"og","|":"eller","$":"dollar","<":"mindre end",">":"større end"},"nb":{"&":"og","Å":"AA","Æ":"AE","Ø":"OE","å":"aa","æ":"ae","ø":"oe"},"it":{"&":"e"},"nl":{"&":"en"},"sv":{"&":"och","Å":"AA","Ä":"AE","Ö":"OE","å":"aa","ä":"ae","ö":"oe"}}');
-
-    	  function replace (string, options) {
-    	    if (typeof string !== 'string') {
-    	      throw new Error('slugify: string argument expected')
-    	    }
-
-    	    options = (typeof options === 'string')
-    	      ? {replacement: options}
-    	      : options || {};
-
-    	    var locale = locales[options.locale] || {};
-
-    	    var replacement = options.replacement === undefined ? '-' : options.replacement;
-
-    	    var trim = options.trim === undefined ? true : options.trim;
-
-    	    var slug = string.normalize().split('')
-    	      // replace characters based on charMap
-    	      .reduce(function (result, ch) {
-    	        var appendChar = locale[ch] || charMap[ch] || ch;
-    	        if (appendChar === replacement) {
-    	          appendChar = ' ';
-    	        }
-    	        return result + appendChar
-    	          // remove not allowed characters
-    	          .replace(options.remove || /[^\w\s$*_+~.()'"!\-:@]+/g, '')
-    	      }, '');
-
-    	    if (options.strict) {
-    	      slug = slug.replace(/[^A-Za-z0-9\s]/g, '');
-    	    }
-
-    	    if (trim) {
-    	      slug = slug.trim();
-    	    }
-
-    	    // Replace spaces with replacement character, treating multiple consecutive
-    	    // spaces as a single space.
-    	    slug = slug.replace(/\s+/g, replacement);
-
-    	    if (options.lower) {
-    	      slug = slug.toLowerCase();
-    	    }
-
-    	    return slug
-    	  }
-
-    	  replace.extend = function (customMap) {
-    	    Object.assign(charMap, customMap);
-    	  };
-
-    	  return replace
-    	}));
-    } (slugify$1));
-
-    var slugify = slugify$1.exports;
-
-    var inArray = function inArray(items, name) {
-      var i = 0;
-
-      if (Array.prototype.indexOf) {
-        return items.indexOf(name, 0) >= 0;
-      } else {
-        for (var n = items.length; i < n; i++) {
-          if (i in items && items[i] === name) {
-            return true;
-          }
-        }
-      }
-
-      return false;
-    };
-
-    var findKeyInObject = function findKeyInObject(obj, key) {
-      if (key && obj) {
-        for (var prop in obj) {
-          if (obj.hasOwnProperty(prop) && prop.toLowerCase() === key.toLowerCase()) {
-            return prop;
-          }
-        }
-      }
-
-      return null;
-    };
-
-    var isObject = function isObject(value) {
-      var objType = Object.prototype.toString.call(value);
-      return objType === '[object Object]' || objType === '[object Error]';
-    };
-
-    var parseNumber = function parseNumber(value) {
-      if (isNaN(value) || !isFinite(value)) {
-        return 0;
-      }
-
-      var floatValue = parseFloat(value);
-      return isNaN(floatValue) ? 0 : floatValue;
-    };
-
-    var parseStringOrNumber = function parseStringOrNumber(value) {
-      if (isStringOrNumber(value)) {
-        return value;
-      } else {
-        return null;
-      }
-    }; // FIXME: REFACTOR for V3
-    // only used in store.js to sanitize server-side formatting of
-    // booleans when checking for `isDevelopmentMode`
-    // Should be removed in v3
-
-
-    var returnConvertedBoolean = function returnConvertedBoolean(data) {
-      if (data === 'false' || data === '0') {
-        return false;
-      } else {
-        return Boolean(data);
-      }
-    };
-
-    var decoded = function decoded(s) {
-      return decodeURIComponent(s.replace(/\+/g, ' '));
-    };
-
-    var converted = function converted(s) {
-      if (s.indexOf('"') === 0) {
-        s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
-      }
-
-      return s;
-    };
-
-    var isString = function isString(value) {
-      return typeof value === 'string';
-    };
-
-    var isNumber = function isNumber(value) {
-      return typeof value === 'number';
-    };
-
-    var isFunction = function isFunction(fn) {
-      return typeof fn === 'function';
-    }; // TODO: Refactor this to a regex
-
-
-    var isDataPlanSlug = function isDataPlanSlug(str) {
-      return isString(str) && str === slugify(str);
-    };
-
-    var isStringOrNumber = function isStringOrNumber(value) {
-      return isString(value) || isNumber(value);
-    };
-
-    var isEmpty = function isEmpty(value) {
-      return value == null || !(Object.keys(value) || value).length;
-    };
+    /**
+     * BatchUploader contains all the logic to upload batches to mParticle.
+     * It queues events as they come in and at set intervals turns them into batches.
+     * It then attempts to upload them to mParticle.
+     *
+     * These uploads happen on an interval basis using window.fetch or XHR
+     * requests, depending on what is available in the browser.
+     *
+     * Uploads can also be triggered on browser visibility/focus changes via an
+     * event listener, which then uploads to mPartice via the browser's Beacon API.
+     */
 
     var BatchUploader =
     /** @class */
     function () {
+      /**
+       * Creates an instance of a BatchUploader
+       * @param {MParticleWebSDK} mpInstance - the mParticle SDK instance
+       * @param {number} uploadInterval - the desired upload interval in milliseconds
+       */
       function BatchUploader(mpInstance, uploadInterval) {
-        var _this_1 = this;
-
         this.mpInstance = mpInstance;
         this.uploadIntervalMillis = uploadInterval;
         this.batchingEnabled = uploadInterval >= BatchUploader.MINIMUM_INTERVAL_MILLIS;
@@ -2116,8 +2140,8 @@ var mParticle = (function () {
           this.uploadIntervalMillis = BatchUploader.MINIMUM_INTERVAL_MILLIS;
         }
 
-        this.pendingEvents = [];
-        this.pendingUploads = [];
+        this.eventsQueuedForProcessing = [];
+        this.batchesQueuedForProcessing = [];
         var _a = this.mpInstance._Store,
             SDKConfig = _a.SDKConfig,
             devToken = _a.devToken;
@@ -2125,14 +2149,16 @@ var mParticle = (function () {
         var baseUrl = this.mpInstance._Helpers.createServiceUrl(SDKConfig.v3SecureServiceUrl, devToken);
 
         this.uploadUrl = "".concat(baseUrl, "/events");
-        setTimeout(function () {
-          _this_1.prepareAndUpload(true, false);
-        }, this.uploadIntervalMillis);
+        this.uploader = window.fetch ? new FetchUploader(this.uploadUrl) : new XHRUploader(this.uploadUrl);
+        this.triggerUploadInterval(true, false);
         this.addEventListeners();
-      }
+      } // Adds listeners to be used trigger Navigator.sendBeacon if the browser
+      // loses focus for any reason, such as closing browser tab or minimizing window
+
 
       BatchUploader.prototype.addEventListeners = function () {
-        var _this = this;
+        var _this = this; // visibility change is a document property, not window
+
 
         document.addEventListener('visibilitychange', function () {
           _this.prepareAndUpload(false, _this.isBeaconAvailable());
@@ -2151,13 +2177,36 @@ var mParticle = (function () {
         }
 
         return false;
+      }; // Triggers a setTimeout for prepareAndUpload
+
+
+      BatchUploader.prototype.triggerUploadInterval = function (triggerFuture, useBeacon) {
+        var _this_1 = this;
+
+        if (triggerFuture === void 0) {
+          triggerFuture = false;
+        }
+
+        if (useBeacon === void 0) {
+          useBeacon = false;
+        }
+
+        setTimeout(function () {
+          _this_1.prepareAndUpload(triggerFuture, useBeacon);
+        }, this.uploadIntervalMillis);
       };
+      /**
+       * This method will queue a single Event which will eventually be processed into a Batch
+       * @param event event that should be queued
+       */
+
 
       BatchUploader.prototype.queueEvent = function (event) {
         if (!isEmpty(event)) {
-          this.pendingEvents.push(event);
+          this.eventsQueuedForProcessing.push(event);
           this.mpInstance.Logger.verbose("Queuing event: ".concat(JSON.stringify(event)));
-          this.mpInstance.Logger.verbose("Queued event count: ".concat(this.pendingEvents.length));
+          this.mpInstance.Logger.verbose("Queued event count: ".concat(this.eventsQueuedForProcessing.length)); // TODO: Remove this check once the v2 code path is removed
+          //       https://go.mparticle.com/work/SQDSDKS-3720
 
           if (!this.batchingEnabled || Types.TriggerUploadType[event.EventDataType]) {
             this.prepareAndUpload(false, false);
@@ -2175,7 +2224,7 @@ var mParticle = (function () {
        */
 
 
-      BatchUploader.createNewUploads = function (sdkEvents, defaultUser, mpInstance) {
+      BatchUploader.createNewBatches = function (sdkEvents, defaultUser, mpInstance) {
         if (!defaultUser || !sdkEvents || !sdkEvents.length) {
           return null;
         } //bucket by MPID, and then by session, ordered by timestamp
@@ -2255,157 +2304,139 @@ var mParticle = (function () {
 
       BatchUploader.prototype.prepareAndUpload = function (triggerFuture, useBeacon) {
         return __awaiter(this, void 0, void 0, function () {
-          var currentUser, currentEvents, newUploads, currentUploads, remainingUploads;
+          var currentUser, currentEvents, newBatches, batchesToUpload, batchesThatDidNotUpload, promises;
 
-          var _a, _b;
+          var _a;
 
           var _this_1 = this;
 
-          return __generator(this, function (_c) {
-            switch (_c.label) {
-              case 0:
-                currentUser = this.mpInstance.Identity.getCurrentUser();
-                currentEvents = this.pendingEvents;
-                this.pendingEvents = [];
-                newUploads = BatchUploader.createNewUploads(currentEvents, currentUser, this.mpInstance);
+          return __generator(this, function (_b) {
+            currentUser = this.mpInstance.Identity.getCurrentUser();
+            currentEvents = this.eventsQueuedForProcessing;
+            this.eventsQueuedForProcessing = [];
+            newBatches = BatchUploader.createNewBatches(currentEvents, currentUser, this.mpInstance);
 
-                if (newUploads && newUploads.length) {
-                  (_a = this.pendingUploads).push.apply(_a, newUploads);
-                }
+            if (!isEmpty(newBatches)) {
+              (_a = this.batchesQueuedForProcessing).push.apply(_a, newBatches);
+            }
 
-                currentUploads = this.pendingUploads;
-                this.pendingUploads = [];
-                return [4
-                /*yield*/
-                , this.upload(this.mpInstance.Logger, currentUploads, useBeacon)];
+            batchesToUpload = this.batchesQueuedForProcessing;
+            batchesThatDidNotUpload = [];
+            this.batchesQueuedForProcessing = [];
+            promises = batchesToUpload.map(function (upload) {
+              return _this_1.upload(_this_1.mpInstance.Logger, upload, useBeacon);
+            }); // Iterate through fulfilled promises and store any remaining batches
+            // for future re-transmission attempts
 
-              case 1:
-                remainingUploads = _c.sent();
+            if (!isEmpty(promises)) {
+              Promise.all(promises).then(function (batchResponses) {
+                batchResponses.forEach(function (batch) {
+                  return !isEmpty(batch) ? batchesThatDidNotUpload.push(batch) : null;
+                });
+              })["catch"](function (error) {
+                _this_1.mpInstance.Logger.error("Error processing batches during upload attempt: ".concat(error));
+              })["finally"](function () {
+                var _a; // Any batches that did not upload should be put back into the queue for processing
 
-                if (remainingUploads && remainingUploads.length) {
-                  (_b = this.pendingUploads).unshift.apply(_b, remainingUploads);
-                }
 
-                if (triggerFuture) {
-                  setTimeout(function () {
-                    _this_1.prepareAndUpload(true, false);
-                  }, this.uploadIntervalMillis);
+                if (!isEmpty(batchesThatDidNotUpload)) {
+                  (_a = _this_1.batchesQueuedForProcessing).unshift.apply(_a, batchesThatDidNotUpload);
                 }
+              });
+            }
 
-                return [2
-                /*return*/
-                ];
+            if (triggerFuture) {
+              this.triggerUploadInterval(triggerFuture, false);
             }
+
+            return [2
+            /*return*/
+            ];
           });
         });
       };
 
-      BatchUploader.prototype.upload = function (logger, _uploads, useBeacon) {
+      BatchUploader.prototype.upload = function (logger, batch, useBeacon) {
         return __awaiter(this, void 0, void 0, function () {
-          var uploader, uploads, i, fetchPayload, blob, response, e_1;
+          var fetchPayload, blob, response, error_1;
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
-                uploads = _uploads.filter(function (upload) {
-                  return !isEmpty(upload.events);
-                });
-
-                if (isEmpty(uploads)) {
+                if (isEmpty(batch) || isEmpty(batch.events)) {
                   return [2
                   /*return*/
                   , null];
                 }
 
-                logger.verbose("Uploading batches: ".concat(JSON.stringify(uploads)));
-                logger.verbose("Batch count: ".concat(uploads.length));
-                i = 0;
-                _a.label = 1;
-
-              case 1:
-                if (!(i < uploads.length)) return [3
-                /*break*/
-                , 7];
+                logger.verbose("Uploading batches: ".concat(JSON.stringify(batch)));
                 fetchPayload = {
                   method: 'POST',
                   headers: {
                     Accept: BatchUploader.CONTENT_TYPE,
                     'Content-Type': 'text/plain;charset=UTF-8'
                   },
-                  body: JSON.stringify(uploads[i])
+                  body: JSON.stringify(batch)
                 };
                 if (!(useBeacon && this.isBeaconAvailable())) return [3
                 /*break*/
-                , 2];
+                , 1];
                 blob = new Blob([fetchPayload.body], {
                   type: 'text/plain;charset=UTF-8'
                 });
                 navigator.sendBeacon(this.uploadUrl, blob);
                 return [3
                 /*break*/
-                , 6];
-
-              case 2:
-                if (!uploader) {
-                  if (window.fetch) {
-                    uploader = new FetchUploader(this.uploadUrl, logger);
-                  } else {
-                    uploader = new XHRUploader(this.uploadUrl, logger);
-                  }
-                }
+                , 4];
 
-                _a.label = 3;
-
-              case 3:
-                _a.trys.push([3, 5,, 6]);
+              case 1:
+                _a.trys.push([1, 3,, 4]);
 
                 return [4
                 /*yield*/
-                , uploader.upload(fetchPayload, uploads, i)];
+                , this.uploader.upload(fetchPayload)];
 
-              case 4:
-                response = _a.sent();
+              case 2:
+                response = _a.sent(); // TODO: Should we make this a switch statement instead?
 
                 if (response.status >= 200 && response.status < 300) {
-                  logger.verbose("Upload success for request ID: ".concat(uploads[i].source_request_id));
+                  logger.verbose("Upload success for request ID: ".concat(batch.source_request_id));
+                  return [2
+                  /*return*/
+                  , null];
                 } else if (response.status >= 500 || response.status === 429) {
-                  logger.error("HTTP error status ".concat(response.status, " received")); //server error, add back current events and try again later
+                  logger.error("HTTP error status ".concat(response.status, " received")); // Server error, return current batch and try again later
 
                   return [2
                   /*return*/
-                  , uploads.slice(i, uploads.length)];
+                  , batch];
                 } else if (response.status >= 401) {
-                  logger.error("HTTP error status ".concat(response.status, " while uploading - please verify your API key.")); //if we're getting a 401, assume we'll keep getting a 401 and clear the uploads.
+                  logger.error("HTTP error status ".concat(response.status, " while uploading - please verify your API key.")); // if we're getting a 401, assume we'll keep getting a 401
+                  // so return the upload so it can be stored for later use
 
                   return [2
                   /*return*/
-                  , null];
+                  , batch];
                 }
 
                 return [3
                 /*break*/
-                , 6];
+                , 4];
 
-              case 5:
-                e_1 = _a.sent();
-                logger.error("Error sending event to mParticle servers. ".concat(e_1));
+              case 3:
+                error_1 = _a.sent();
+                logger.error("Error sending event to mParticle servers. ".concat(error_1));
                 return [2
                 /*return*/
-                , uploads.slice(i, uploads.length)];
+                , batch];
 
-              case 6:
-                i++;
-                return [3
-                /*break*/
-                , 1];
-
-              case 7:
+              case 4:
                 return [2
                 /*return*/
                 , null];
             }
           });
         });
-      }; //we upload JSON, but this content type is required to avoid a CORS preflight request
+      }; // We upload JSON, but this content type is required to avoid a CORS preflight request
 
 
       BatchUploader.CONTENT_TYPE = 'text/plain;charset=UTF-8';
@@ -2416,9 +2447,8 @@ var mParticle = (function () {
     var AsyncUploader =
     /** @class */
     function () {
-      function AsyncUploader(url, logger) {
+      function AsyncUploader(url) {
         this.url = url;
-        this.logger = logger;
       }
 
       return AsyncUploader;
@@ -2433,7 +2463,7 @@ var mParticle = (function () {
         return _super !== null && _super.apply(this, arguments) || this;
       }
 
-      FetchUploader.prototype.upload = function (fetchPayload, uploads, i) {
+      FetchUploader.prototype.upload = function (fetchPayload) {
         return __awaiter(this, void 0, void 0, function () {
           var response;
           return __generator(this, function (_a) {
@@ -2465,7 +2495,7 @@ var mParticle = (function () {
         return _super !== null && _super.apply(this, arguments) || this;
       }
 
-      XHRUploader.prototype.upload = function (fetchPayload, uploads, i) {
+      XHRUploader.prototype.upload = function (fetchPayload) {
         return __awaiter(this, void 0, void 0, function () {
           var response;
           return __generator(this, function (_a) {
@@ -2473,7 +2503,7 @@ var mParticle = (function () {
               case 0:
                 return [4
                 /*yield*/
-                , this.makeRequest(this.url, this.logger, fetchPayload.body)];
+                , this.makeRequest(this.url, fetchPayload.body)];
 
               case 1:
                 response = _a.sent();
@@ -2485,7 +2515,7 @@ var mParticle = (function () {
         });
       };
 
-      XHRUploader.prototype.makeRequest = function (url, logger, data) {
+      XHRUploader.prototype.makeRequest = function (url, data) {
         return __awaiter(this, void 0, void 0, function () {
           var xhr;
           return __generator(this, function (_a) {
@@ -2657,7 +2687,8 @@ var mParticle = (function () {
       };
 
       this.sendBatchForwardingStatsToServer = function (forwardingStatsData, xhr) {
-        var url, data;
+        var url;
+        var data;
 
         try {
           url = mpInstance._Helpers.createServiceUrl(mpInstance._Store.SDKConfig.v2SecureServiceUrl, mpInstance._Store.devToken);
@@ -2676,25 +2707,26 @@ var mParticle = (function () {
       };
 
       this.sendSingleForwardingStatsToServer = function (forwardingStatsData) {
-        var url, data;
+        var url;
+        var data;
 
         try {
           var xhrCallback = function xhrCallback() {
-            if (xhr.readyState === 4) {
-              if (xhr.status === 202) {
-                mpInstance.Logger.verbose('Successfully sent  ' + xhr.statusText + ' from server');
+            if (xhr_1.readyState === 4) {
+              if (xhr_1.status === 202) {
+                mpInstance.Logger.verbose('Successfully sent  ' + xhr_1.statusText + ' from server');
               }
             }
           };
 
-          var xhr = mpInstance._Helpers.createXHR(xhrCallback);
+          var xhr_1 = mpInstance._Helpers.createXHR(xhrCallback);
 
           url = mpInstance._Helpers.createServiceUrl(mpInstance._Store.SDKConfig.v1SecureServiceUrl, mpInstance._Store.devToken);
           data = forwardingStatsData;
 
-          if (xhr) {
-            xhr.open('post', url + '/Forwarding');
-            xhr.send(JSON.stringify(data));
+          if (xhr_1) {
+            xhr_1.open('post', url + '/Forwarding');
+            xhr_1.send(JSON.stringify(data));
           }
         } catch (e) {
           mpInstance.Logger.error('Error sending forwarding stats to mParticle servers.');
@@ -2702,8 +2734,9 @@ var mParticle = (function () {
       };
 
       this.prepareForwardingStats = function (forwarder, event) {
-        var forwardingStatsData,
-            queue = mpInstance._Forwarders.getForwarderStatsQueue();
+        var forwardingStatsData;
+
+        var queue = mpInstance._Forwarders.getForwarderStatsQueue();
 
         if (forwarder && forwarder.isVisible) {
           forwardingStatsData = {
@@ -10646,6 +10679,11 @@ var mParticle = (function () {
           _resetForTests: mockFunction,
           _APIClient: null,
           _Consent: null,
+          _Forwarders: null,
+          _NativeSdkHelpers: null,
+          _Persistence: null,
+          _preInit: null,
+          Consent: null,
           _ServerModel: null,
           _SessionManager: null,
           _Store: {